summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--0bs1d1an.html46
-rw-r--r--0bs1d1an.txt16
-rw-r--r--2xsaiko.html44
-rw-r--r--2xsaiko.txt16
-rw-r--r--4nykey.html44
-rw-r--r--4nykey.txt16
-rw-r--r--AlexandreFournier.html44
-rw-r--r--AlexandreFournier.txt16
-rw-r--r--ArchFeh.html44
-rw-r--r--ArchFeh.txt16
-rw-r--r--AstroFloyd.html44
-rw-r--r--AstroFloyd.txt16
-rw-r--r--AzP.html46
-rw-r--r--AzP.txt16
-rw-r--r--Case_Of.html44
-rw-r--r--Case_Of.txt16
-rw-r--r--Drauthius.html44
-rw-r--r--Drauthius.txt16
-rw-r--r--DuPol.html48
-rw-r--r--DuPol.txt19
-rw-r--r--FireBurn.html260
-rw-r--r--FireBurn.txt136
-rw-r--r--HomeAssistantRepository.html44
-rw-r--r--HomeAssistantRepository.txt16
-rw-r--r--JRG.html44
-rw-r--r--JRG.txt19
-rw-r--r--KBrown-pub.html44
-rw-r--r--KBrown-pub.txt18
-rw-r--r--ROKO__.html44
-rw-r--r--ROKO__.txt19
-rw-r--r--R_Overlay.html60
-rw-r--r--R_Overlay.txt24
-rw-r--r--SwordArMor.html20
-rw-r--r--SwordArMor.txt5
-rw-r--r--ace.html44
-rw-r--r--ace.txt27
-rw-r--r--activehome.html44
-rw-r--r--activehome.txt24
-rw-r--r--aeon-gentoo-overlay.html44
-rw-r--r--aeon-gentoo-overlay.txt24
-rw-r--r--ag-ops.html44
-rw-r--r--ag-ops.txt27
-rw-r--r--ago.html44
-rw-r--r--ago.txt27
-rw-r--r--ahyangyi-overlay.html52
-rw-r--r--ahyangyi-overlay.txt24
-rw-r--r--alatar-lay.html44
-rw-r--r--alatar-lay.txt19
-rw-r--r--alesharik.html44
-rw-r--r--alesharik.txt19
-rw-r--r--alexcepoi.html44
-rw-r--r--alexcepoi.txt19
-rw-r--r--alexxy.html46
-rw-r--r--alexxy.txt19
-rw-r--r--aluco.html44
-rw-r--r--aluco.txt19
-rw-r--r--alxu.html76
-rw-r--r--alxu.txt44
-rw-r--r--amedeos.html44
-rw-r--r--amedeos.txt27
-rw-r--r--anarchy.html62
-rw-r--r--anarchy.txt37
-rw-r--r--anard.html64
-rw-r--r--anard.txt38
-rw-r--r--anaximander.html92
-rw-r--r--anaximander.txt51
-rw-r--r--anders-larsson.html92
-rw-r--r--anders-larsson.txt51
-rw-r--r--andrey_utkin.html76
-rw-r--r--andrey_utkin.txt43
-rw-r--r--anomen.html78
-rw-r--r--anomen.txt43
-rw-r--r--anyc.html114
-rw-r--r--anyc.txt43
-rw-r--r--apriluwu.html74
-rw-r--r--apriluwu.txt42
-rw-r--r--archenroot.html84
-rw-r--r--archenroot.txt44
-rw-r--r--argent-main.html100
-rw-r--r--argent-main.txt45
-rw-r--r--arx-libertatis.html76
-rw-r--r--arx-libertatis.txt43
-rw-r--r--audio-overlay.html88
-rw-r--r--audio-overlay.txt49
-rw-r--r--average.html82
-rw-r--r--average.txt46
-rw-r--r--awesome.html82
-rw-r--r--awesome.txt46
-rw-r--r--barnowl.html82
-rw-r--r--barnowl.txt46
-rw-r--r--beatussum-overlay.html82
-rw-r--r--beatussum-overlay.txt46
-rw-r--r--benzene-overlay.html86
-rw-r--r--benzene-overlay.txt48
-rw-r--r--bes.html86
-rw-r--r--bes.txt48
-rw-r--r--bezerker.html84
-rw-r--r--bezerker.txt47
-rw-r--r--bibletime.html84
-rw-r--r--bibletime.txt47
-rw-r--r--binaryden.html94
-rw-r--r--binaryden.txt52
-rw-r--r--bircoph.html96
-rw-r--r--bircoph.txt53
-rw-r--r--bitcetera.html92
-rw-r--r--bitcetera.txt51
-rw-r--r--bitcoin.html92
-rw-r--r--bitcoin.txt51
-rw-r--r--bleeding-edge.html94
-rw-r--r--bleeding-edge.txt50
-rw-r--r--blender-gentoo-logo.html90
-rw-r--r--blender-gentoo-logo.txt50
-rw-r--r--bloody.html84
-rw-r--r--bloody.txt47
-rw-r--r--bobwya.html82
-rw-r--r--bobwya.txt46
-rw-r--r--bombo82.html86
-rw-r--r--bombo82.txt48
-rw-r--r--booboo.html134
-rw-r--r--booboo.txt48
-rw-r--r--brave-overlay.html88
-rw-r--r--brave-overlay.txt49
-rw-r--r--bright.html332
-rw-r--r--bright.txt167
-rw-r--r--brother-overlay.html84
-rw-r--r--brother-overlay.txt47
-rw-r--r--bubba.html84
-rw-r--r--bubba.txt47
-rw-r--r--bumblebee.html92
-rw-r--r--bumblebee.txt51
-rw-r--r--buzden.html84
-rw-r--r--buzden.txt47
-rw-r--r--calculate.html86
-rw-r--r--calculate.txt57
-rw-r--r--canutethegreat-overlay.html90
-rw-r--r--canutethegreat-overlay.txt48
-rw-r--r--ceamac.html98
-rw-r--r--ceamac.txt54
-rw-r--r--certbot-dns-plugins.html98
-rw-r--r--certbot-dns-plugins.txt54
-rw-r--r--cg.html108
-rw-r--r--cg.txt54
-rw-r--r--chrisadr.html114
-rw-r--r--chrisadr.txt61
-rw-r--r--chrytoo.html108
-rw-r--r--chrytoo.txt59
-rw-r--r--chymeric.html114
-rw-r--r--chymeric.txt61
-rw-r--r--cj-overlay.html102
-rw-r--r--cj-overlay.txt56
-rw-r--r--concaveoverlay.html252
-rw-r--r--concaveoverlay.txt131
-rw-r--r--cosmicmod.html228
-rw-r--r--cosmicmod.txt119
-rw-r--r--crocket-overlay.html72
-rw-r--r--crocket-overlay.txt41
-rw-r--r--crossdev.html70
-rw-r--r--crossdev.txt40
-rw-r--r--dMaggot.html66
-rw-r--r--dMaggot.txt36
-rw-r--r--dargor.html62
-rw-r--r--dargor.txt36
-rw-r--r--darkelf.html62
-rw-r--r--darkelf.txt36
-rw-r--r--darthgandalf-overlay.html62
-rw-r--r--darthgandalf-overlay.txt36
-rw-r--r--decent-im.html68
-rw-r--r--decent-im.txt36
-rw-r--r--deepin.html82
-rw-r--r--deepin.txt40
-rw-r--r--defiance.html68
-rw-r--r--defiance.txt38
-rw-r--r--delicious-absurdities.html74
-rw-r--r--delicious-absurdities.txt39
-rw-r--r--dequbed.html68
-rw-r--r--dequbed.txt38
-rw-r--r--dev1990-overlay.html70
-rw-r--r--dev1990-overlay.txt40
-rw-r--r--dilfridge.html70
-rw-r--r--dilfridge.txt40
-rw-r--r--displacer.html70
-rw-r--r--displacer.txt40
-rw-r--r--distros.html70
-rw-r--r--distros.txt40
-rw-r--r--djc.html84
-rw-r--r--djc.txt47
-rw-r--r--dlang.html86
-rw-r--r--dlang.txt48
-rw-r--r--dm9pZCAq.html88
-rw-r--r--dm9pZCAq.txt49
-rw-r--r--dmchurch.html86
-rw-r--r--dmchurch.txt48
-rw-r--r--dotnet.html86
-rw-r--r--dotnet.txt48
-rw-r--r--drdim.html88
-rw-r--r--drdim.txt49
-rw-r--r--dwfreed.html92
-rw-r--r--dwfreed.txt51
-rw-r--r--dwosky.html92
-rw-r--r--dwosky.txt51
-rw-r--r--earshark.html94
-rw-r--r--earshark.txt52
-rw-r--r--eclipse.html102
-rw-r--r--eclipse.txt56
-rw-r--r--edgets.html102
-rw-r--r--edgets.txt56
-rw-r--r--eigenlay.html94
-rw-r--r--eigenlay.txt52
-rw-r--r--einflay.html86
-rw-r--r--einflay.txt47
-rw-r--r--ejabberd.html84
-rw-r--r--ejabberd.txt47
-rw-r--r--electron.html84
-rw-r--r--electron.txt47
-rw-r--r--elementary.html86
-rw-r--r--elementary.txt47
-rw-r--r--elopez-r-overlay.html76
-rw-r--r--elopez-r-overlay.txt43
-rw-r--r--emacs.html78
-rw-r--r--emacs.txt44
-rw-r--r--enlightenment-live.html80
-rw-r--r--enlightenment-live.txt45
-rw-r--r--ennui.html88
-rw-r--r--ennui.txt44
-rw-r--r--equaeghe.html76
-rw-r--r--equaeghe.txt43
-rw-r--r--erayd.html78
-rw-r--r--erayd.txt44
-rw-r--r--escpr2.html80
-rw-r--r--escpr2.txt45
-rw-r--r--ethereum.html80
-rw-r--r--ethereum.txt45
-rw-r--r--eugene-bright.html78
-rw-r--r--eugene-bright.txt44
-rw-r--r--ext-devlibs.html78
-rw-r--r--ext-devlibs.txt44
-rw-r--r--farmboy0.html78
-rw-r--r--farmboy0.txt44
-rw-r--r--fem-overlay.html78
-rw-r--r--fem-overlay.txt44
-rw-r--r--ferki.html78
-rw-r--r--ferki.txt44
-rw-r--r--fidonet.html116
-rw-r--r--fidonet.txt53
-rw-r--r--flammie.html92
-rw-r--r--flammie.txt51
-rw-r--r--flavour.html96
-rw-r--r--flavour.txt53
-rw-r--r--flewkey-overlay.html96
-rw-r--r--flewkey-overlay.txt53
-rw-r--r--flightsim.html94
-rw-r--r--flightsim.txt52
-rw-r--r--floppym.html92
-rw-r--r--floppym.txt51
-rw-r--r--flow.html92
-rw-r--r--flow.txt61
-rw-r--r--flussence.html92
-rw-r--r--flussence.txt51
-rw-r--r--fol4.html80
-rw-r--r--fol4.txt44
-rw-r--r--foo-overlay.html78
-rw-r--r--foo-overlay.txt44
-rw-r--r--fordfrog.html76
-rw-r--r--fordfrog.txt43
-rw-r--r--fowlay.html82
-rw-r--r--fowlay.txt46
-rw-r--r--foxiverlay.html78
-rw-r--r--foxiverlay.txt44
-rw-r--r--fritteli.html78
-rw-r--r--fritteli.txt44
-rw-r--r--frr-gentoo.html82
-rw-r--r--frr-gentoo.txt46
-rw-r--r--fusion809.html104
-rw-r--r--fusion809.txt50
-rw-r--r--fuverlay.html96
-rw-r--r--fuverlay.txt50
-rw-r--r--gamarouns.html96
-rw-r--r--gamarouns.txt49
-rw-r--r--gamerlay.html88
-rw-r--r--gamerlay.txt49
-rw-r--r--gcarq.html90
-rw-r--r--gcarq.txt50
-rw-r--r--genthree.html102
-rw-r--r--genthree.txt51
-rw-r--r--gentoo-bootstrap.html84
-rw-r--r--gentoo-bootstrap.txt47
-rw-r--r--gentoo-clang.html84
-rw-r--r--gentoo-clang.txt47
-rw-r--r--gentoo-mate.html92
-rw-r--r--gentoo-mate.txt49
-rw-r--r--gentoo-zh.html88
-rw-r--r--gentoo-zh.txt49
-rw-r--r--gentoo.html314
-rw-r--r--gentoo.txt72
-rw-r--r--gentoobr.html88
-rw-r--r--gentoobr.txt49
-rw-r--r--gerislay.html82
-rw-r--r--gerislay.txt46
-rw-r--r--gig.html326
-rw-r--r--gig.txt165
-rw-r--r--gitlab.html78
-rw-r--r--gitlab.txt44
-rw-r--r--glarbs-overlay.html78
-rw-r--r--glarbs-overlay.txt44
-rw-r--r--gnome-next.html82
-rw-r--r--gnome-next.txt44
-rw-r--r--gnome.html102
-rw-r--r--gnome.txt45
-rw-r--r--gnuradio.html80
-rw-r--r--gnuradio.txt45
-rw-r--r--gnustep.html80
-rw-r--r--gnustep.txt45
-rw-r--r--gnux32.html112
-rw-r--r--gnux32.txt49
-rw-r--r--go-overlay.html88
-rw-r--r--go-overlay.txt49
-rw-r--r--godin.html84
-rw-r--r--godin.txt47
-rw-r--r--goduck777.html88
-rw-r--r--goduck777.txt49
-rw-r--r--goris.html104
-rw-r--r--goris.txt51
-rw-r--r--graaff.html94
-rw-r--r--graaff.txt52
-rw-r--r--griffon_overlay.html92
-rw-r--r--griffon_overlay.txt51
-rw-r--r--grub2-themes.html100
-rw-r--r--grub2-themes.txt55
-rw-r--r--gsview-overlay.html100
-rw-r--r--gsview-overlay.txt55
-rw-r--r--guru.html102
-rw-r--r--guru.txt58
-rw-r--r--haarp.html100
-rw-r--r--haarp.txt55
-rw-r--r--hamper-overlay.html100
-rw-r--r--hamper-overlay.txt55
-rw-r--r--han.html100
-rw-r--r--han.txt55
-rw-r--r--hangul-typing.html100
-rw-r--r--hangul-typing.txt55
-rw-r--r--haskell.html94
-rw-r--r--haskell.txt52
-rw-r--r--heindsight.html94
-rw-r--r--heindsight.txt52
-rw-r--r--hering-overlay.html94
-rw-r--r--hering-overlay.txt52
-rw-r--r--hexedit-overlay.html94
-rw-r--r--hexedit-overlay.txt52
-rw-r--r--hibiscus.html92
-rw-r--r--hibiscus.txt51
-rw-r--r--holgersson-overlay.html46
-rw-r--r--holgersson-overlay.txt25
-rw-r--r--hossie.html46
-rw-r--r--hossie.txt25
-rw-r--r--hotstoast.html46
-rw-r--r--hotstoast.txt25
-rw-r--r--ikelos.html86
-rw-r--r--ikelos.txt25
-rw-r--r--index.html12
-rw-r--r--ixit.html46
-rw-r--r--ixit.txt26
-rw-r--r--jacendi-overlay.html46
-rw-r--r--jacendi-overlay.txt26
-rw-r--r--jamesbroadhead.html46
-rw-r--r--jamesbroadhead.txt26
-rw-r--r--java.html52
-rw-r--r--java.txt28
-rw-r--r--jboro-overlay.html46
-rw-r--r--jboro-overlay.txt28
-rw-r--r--jkolo.html280
-rw-r--r--jkolo.txt145
-rw-r--r--jm-overlay.html46
-rw-r--r--jm-overlay.txt29
-rw-r--r--jmbsvicetto.html60
-rw-r--r--jmbsvicetto.txt33
-rw-r--r--johnmh.html188
-rw-r--r--johnmh.txt101
-rw-r--r--johu.html46
-rw-r--r--johu.txt25
-rw-r--r--jorgicio.html68
-rw-r--r--jorgicio.txt27
-rw-r--r--jsteward.html58
-rw-r--r--jsteward.txt36
-rw-r--r--junkdrawer.html182
-rw-r--r--junkdrawer.txt29
-rw-r--r--kaa.html34
-rw-r--r--kaa.txt30
-rw-r--r--kde.html34
-rw-r--r--kde.txt30
-rw-r--r--keepbot-overlay.html68
-rw-r--r--keepbot-overlay.txt41
-rw-r--r--khoverlay.html54
-rw-r--r--khoverlay.txt34
-rw-r--r--klondike.html304
-rw-r--r--klondike.txt158
-rw-r--r--konsolebox.html54
-rw-r--r--konsolebox.txt34
-rw-r--r--kripton-overlay.html52
-rw-r--r--kripton-overlay.txt33
-rw-r--r--kske.html84
-rw-r--r--kske.txt49
-rw-r--r--lanodanOverlay.html90
-rw-r--r--lanodanOverlay.txt49
-rw-r--r--laurentb.html128
-rw-r--r--laurentb.txt49
-rw-r--r--leechcraft.html94
-rw-r--r--leechcraft.txt54
-rw-r--r--leio.html86
-rw-r--r--leio.txt49
-rw-r--r--levenkov.html86
-rw-r--r--levenkov.txt49
-rw-r--r--librepilot.html84
-rw-r--r--librepilot.txt49
-rw-r--r--libressl.html84
-rw-r--r--libressl.txt49
-rw-r--r--liftm.html84
-rw-r--r--liftm.txt49
-rw-r--r--linux-be.html236
-rw-r--r--linux-be.txt125
-rw-r--r--linuxunderground-overlay.html94
-rw-r--r--linuxunderground-overlay.txt54
-rw-r--r--linxon.html136
-rw-r--r--linxon.txt51
-rw-r--r--lisp.html90
-rw-r--r--lisp.txt52
-rw-r--r--lmiphay.html94
-rw-r--r--lmiphay.txt54
-rw-r--r--lto-overlay.html92
-rw-r--r--lto-overlay.txt53
-rw-r--r--luke-jr.html94
-rw-r--r--luke-jr.txt54
-rw-r--r--luxifer.html92
-rw-r--r--luxifer.txt53
-rw-r--r--lxde-gtk3.html112
-rw-r--r--lxde-gtk3.txt53
-rw-r--r--maekke.html92
-rw-r--r--maekke.txt53
-rw-r--r--mate-de-gentoo.html92
-rw-r--r--mate-de-gentoo.txt53
-rw-r--r--matrix.html96
-rw-r--r--matrix.txt54
-rw-r--r--megacoffee.html92
-rw-r--r--megacoffee.txt53
-rw-r--r--menelkir.html94
-rw-r--r--menelkir.txt54
-rw-r--r--metahax.html90
-rw-r--r--metahax.txt52
-rw-r--r--milos-rs.html90
-rw-r--r--milos-rs.txt52
-rw-r--r--miramir.html92
-rw-r--r--miramir.txt53
-rw-r--r--mklich.html94
-rw-r--r--mklich.txt52
-rw-r--r--mkr-overlay.html92
-rw-r--r--mkr-overlay.txt53
-rw-r--r--moaxcp.html100
-rw-r--r--moaxcp.txt57
-rw-r--r--moexiami.html102
-rw-r--r--moexiami.txt58
-rw-r--r--moltonel.html100
-rw-r--r--moltonel.txt57
-rw-r--r--monero.html102
-rw-r--r--monero.txt58
-rw-r--r--mschiff.html104
-rw-r--r--mschiff.txt59
-rw-r--r--multilib-portage.html102
-rw-r--r--multilib-portage.txt58
-rw-r--r--musl-clang.html98
-rw-r--r--musl-clang.txt56
-rw-r--r--musl.html100
-rw-r--r--musl.txt57
-rw-r--r--mv.html102
-rw-r--r--mv.txt58
-rw-r--r--mva.html98
-rw-r--r--mva.txt56
-rw-r--r--myrvolay.html90
-rw-r--r--myrvolay.txt52
-rw-r--r--mysql.html88
-rw-r--r--mysql.txt51
-rw-r--r--natinst.html84
-rw-r--r--natinst.txt49
-rw-r--r--nelson-graca.html90
-rw-r--r--nelson-graca.txt52
-rw-r--r--nest.html86
-rw-r--r--nest.txt50
-rw-r--r--nico.html84
-rw-r--r--nico.txt49
-rw-r--r--nitratesky.html84
-rw-r--r--nitratesky.txt49
-rw-r--r--nix-guix.html86
-rw-r--r--nix-guix.txt50
-rw-r--r--np-hardass-overlay.html96
-rw-r--r--np-hardass-overlay.txt50
-rw-r--r--nx.html88
-rw-r--r--nx.txt51
-rw-r--r--nymphos.html78
-rw-r--r--nymphos.txt36
-rw-r--r--octopus.html94
-rw-r--r--octopus.txt54
-rw-r--r--oddlama.html94
-rw-r--r--oddlama.txt54
-rw-r--r--olifre.html94
-rw-r--r--olifre.txt54
-rw-r--r--openclonk.html88
-rw-r--r--openclonk.txt51
-rw-r--r--openwrt.html88
-rw-r--r--openwrt.txt51
-rw-r--r--oubliette.html88
-rw-r--r--oubliette.txt51
-rw-r--r--overseerr-overlay.html88
-rw-r--r--overseerr-overlay.txt51
-rw-r--r--palemoon.html82
-rw-r--r--palemoon.txt48
-rw-r--r--panther.html84
-rw-r--r--panther.txt49
-rw-r--r--pdilung.html78
-rw-r--r--pdilung.txt46
-rw-r--r--pentoo.html82
-rw-r--r--pentoo.txt48
-rw-r--r--perl-experimental-snapshots.html78
-rw-r--r--perl-experimental-snapshots.txt45
-rw-r--r--perl-experimental.html82
-rw-r--r--perl-experimental.txt48
-rw-r--r--petkovich.html84
-rw-r--r--petkovich.txt46
-rw-r--r--pf4public.html318
-rw-r--r--pf4public.txt165
-rw-r--r--pg_overlay.html76
-rw-r--r--pg_overlay.txt44
-rw-r--r--phackerlay.html90
-rw-r--r--phackerlay.txt47
-rw-r--r--phoenix591.html82
-rw-r--r--phoenix591.txt47
-rw-r--r--pholthaus-overlay.html82
-rw-r--r--pholthaus-overlay.txt47
-rw-r--r--pica-pica.html84
-rw-r--r--pica-pica.txt48
-rw-r--r--picarica-overlay.html230
-rw-r--r--picarica-overlay.txt119
-rw-r--r--pigfoot.html102
-rw-r--r--pigfoot.txt51
-rw-r--r--piniverlay.html92
-rw-r--r--piniverlay.txt52
-rw-r--r--pinkbyte.html90
-rw-r--r--pinkbyte.txt51
-rw-r--r--pixlra.html244
-rw-r--r--pixlra.txt128
-rw-r--r--pkalin.html92
-rw-r--r--pkalin.txt52
-rw-r--r--plex-overlay.html94
-rw-r--r--plex-overlay.txt53
-rw-r--r--poly-c.html176
-rw-r--r--poly-c.txt60
-rw-r--r--powerman.html90
-rw-r--r--powerman.txt51
-rw-r--r--ppfeufer-gentoo-overlay.html92
-rw-r--r--ppfeufer-gentoo-overlay.txt52
-rw-r--r--pross.html88
-rw-r--r--pross.txt50
-rw-r--r--pyfa.html90
-rw-r--r--pyfa.txt51
-rw-r--r--python.html90
-rw-r--r--python.txt51
-rw-r--r--qemu-init.html82
-rw-r--r--qemu-init.txt47
-rw-r--r--qgp.html82
-rw-r--r--qgp.txt46
-rw-r--r--qownnotes-overlay.html80
-rw-r--r--qownnotes-overlay.txt46
-rw-r--r--qsx.html84
-rw-r--r--qsx.txt48
-rw-r--r--qt.html88
-rw-r--r--qt.txt50
-rw-r--r--quarks.html86
-rw-r--r--quarks.txt49
-rw-r--r--rafaelmartins.html88
-rw-r--r--rafaelmartins.txt48
-rw-r--r--rage.html88
-rw-r--r--rage.txt49
-rw-r--r--raiagent.html94
-rw-r--r--raiagent.txt49
-rw-r--r--rasdark.html88
-rw-r--r--rasdark.txt50
-rw-r--r--raw.html90
-rw-r--r--raw.txt49
-rw-r--r--rdnetto-overlay.html100
-rw-r--r--rdnetto-overlay.txt50
-rw-r--r--reagentoo.html86
-rw-r--r--reagentoo.txt49
-rw-r--r--ricerlay.html88
-rw-r--r--ricerlay.txt50
-rw-r--r--rich0.html84
-rw-r--r--rich0.txt48
-rw-r--r--ring-overlay.html98
-rw-r--r--ring-overlay.txt49
-rw-r--r--rion.html100
-rw-r--r--rion.txt49
-rw-r--r--riru.html92
-rw-r--r--riru.txt52
-rw-r--r--robert7k.html92
-rw-r--r--robert7k.txt52
-rw-r--r--robertgzr.html92
-rw-r--r--robertgzr.txt51
-rw-r--r--roslin.html92
-rw-r--r--roslin.txt52
-rw-r--r--rpm.html160
-rw-r--r--rpm.txt52
-rw-r--r--ruby.html90
-rw-r--r--ruby.txt51
-rw-r--r--rukruk.html86
-rw-r--r--rukruk.txt49
-rw-r--r--rust.html86
-rw-r--r--rust.txt49
-rw-r--r--ryans.html88
-rw-r--r--ryans.txt50
-rw-r--r--sabayon-distro.html296
-rw-r--r--sabayon-distro.txt45
-rw-r--r--sabayon.html158
-rw-r--r--sabayon.txt48
-rw-r--r--sage-on-gentoo.html78
-rw-r--r--sage-on-gentoo.txt45
-rw-r--r--salfter.html78
-rw-r--r--salfter.txt45
-rw-r--r--sam_c.html80
-rw-r--r--sam_c.txt46
-rw-r--r--sarnex-overlay.html78
-rw-r--r--sarnex-overlay.txt45
-rw-r--r--sattvik.html74
-rw-r--r--sattvik.txt43
-rw-r--r--science.html74
-rw-r--r--science.txt43
-rw-r--r--scrill.html76
-rw-r--r--scrill.txt44
-rw-r--r--seden.html76
-rw-r--r--seden.txt44
-rw-r--r--setkeh.html82
-rw-r--r--setkeh.txt47
-rw-r--r--sevcsik.html82
-rw-r--r--sevcsik.txt47
-rw-r--r--sft.html82
-rw-r--r--sft.txt47
-rw-r--r--sgs.html82
-rw-r--r--sgs.txt47
-rw-r--r--shnurise.html182
-rw-r--r--shnurise.txt52
-rw-r--r--sihnon.html90
-rw-r--r--sihnon.txt51
-rw-r--r--simonvanderveldt.html88
-rw-r--r--simonvanderveldt.txt50
-rw-r--r--sinustrom.html90
-rw-r--r--sinustrom.txt51
-rw-r--r--sk-overlay.html90
-rw-r--r--sk-overlay.txt50
-rw-r--r--slonko.html86
-rw-r--r--slonko.txt49
-rw-r--r--slyfox.html96
-rw-r--r--slyfox.txt54
-rw-r--r--smaeul.html82
-rw-r--r--smaeul.txt47
-rw-r--r--snapd.html84
-rw-r--r--snapd.txt48
-rw-r--r--sogo-connector.html84
-rw-r--r--sogo-connector.txt48
-rw-r--r--soltys.html82
-rw-r--r--soltys.txt47
-rw-r--r--sorinp.html84
-rw-r--r--sorinp.txt48
-rw-r--r--sorrow.html82
-rw-r--r--sorrow.txt47
-rw-r--r--spikyatlinux.html82
-rw-r--r--spikyatlinux.txt47
-rw-r--r--sping.html82
-rw-r--r--sping.txt47
-rw-r--r--squeezebox.html84
-rw-r--r--squeezebox.txt48
-rw-r--r--src_prepare-overlay.html86
-rw-r--r--src_prepare-overlay.txt49
-rw-r--r--ssnb.html86
-rw-r--r--ssnb.txt49
-rw-r--r--sspreitz.html86
-rw-r--r--sspreitz.txt49
-rw-r--r--steam-overlay.html86
-rw-r--r--steam-overlay.txt49
-rw-r--r--stefantalpalaru.html88
-rw-r--r--stefantalpalaru.txt49
-rw-r--r--stha09.html86
-rw-r--r--stha09.txt49
-rw-r--r--stowe-verlay.html96
-rw-r--r--stowe-verlay.txt48
-rw-r--r--strohel.html86
-rw-r--r--strohel.txt49
-rw-r--r--stuff.html108
-rw-r--r--stuff.txt60
-rw-r--r--summary.json2
-rw-r--r--superposition.html86
-rw-r--r--superposition.txt49
-rw-r--r--swegener.html148
-rw-r--r--swegener.txt51
-rw-r--r--tabinol.html94
-rw-r--r--tabinol.txt52
-rw-r--r--tamiko.html86
-rw-r--r--tamiko.txt49
-rw-r--r--tante.html86
-rw-r--r--tante.txt49
-rw-r--r--tarantool.html88
-rw-r--r--tarantool.txt50
-rw-r--r--tastytea.html86
-rw-r--r--tastytea.txt49
-rw-r--r--tatsh-overlay.html98
-rw-r--r--tatsh-overlay.txt55
-rw-r--r--telans.html88
-rw-r--r--telans.txt50
-rw-r--r--tf201.html90
-rw-r--r--tf201.txt51
-rw-r--r--tgbugs-overlay.html92
-rw-r--r--tgbugs-overlay.txt52
-rw-r--r--thabairne.html92
-rw-r--r--thabairne.txt52
-rw-r--r--thegreatmcpain.html92
-rw-r--r--thegreatmcpain.txt52
-rw-r--r--tmacedo.html92
-rw-r--r--tmacedo.txt52
-rw-r--r--tocaro.html92
-rw-r--r--tocaro.txt52
-rw-r--r--toniz4-overlay.html92
-rw-r--r--toniz4-overlay.txt52
-rw-r--r--toolchain.html98
-rw-r--r--toolchain.txt55
-rw-r--r--torbrowser.html98
-rw-r--r--torbrowser.txt55
-rw-r--r--trolltoo.html98
-rw-r--r--trolltoo.txt55
-rw-r--r--tryton.html116
-rw-r--r--tryton.txt50
-rw-r--r--twister.html86
-rw-r--r--twister.txt49
-rw-r--r--ulm.html62
-rw-r--r--ulm.txt37
-rw-r--r--ultrabug.html106
-rw-r--r--ultrabug.txt37
-rw-r--r--unc3nsored.html64
-rw-r--r--unc3nsored.txt38
-rw-r--r--unity-gentoo.html60
-rw-r--r--unity-gentoo.txt36
-rw-r--r--usenet-overlay.html66
-rw-r--r--usenet-overlay.txt38
-rw-r--r--vampire.html68
-rw-r--r--vampire.txt38
-rw-r--r--vapoursynth.html66
-rw-r--r--vapoursynth.txt38
-rw-r--r--vayerx.html66
-rw-r--r--vayerx.txt38
-rw-r--r--vdr-devel.html74
-rw-r--r--vdr-devel.txt41
-rw-r--r--vifino-overlay.html72
-rw-r--r--vifino-overlay.txt41
-rw-r--r--vklimovs.html72
-rw-r--r--vklimovs.txt41
-rw-r--r--vmacs.html74
-rw-r--r--vmacs.txt42
-rw-r--r--vortex.html76
-rw-r--r--vortex.txt43
-rw-r--r--vowstar.html68
-rw-r--r--vowstar.txt39
-rw-r--r--voyageur.html86
-rw-r--r--voyageur.txt48
-rw-r--r--waebbl.html92
-rw-r--r--waebbl.txt51
-rw-r--r--waffle-builds.html90
-rw-r--r--waffle-builds.txt50
-rw-r--r--wayland-desktop.html92
-rw-r--r--wayland-desktop.txt51
-rw-r--r--wbrana.html92
-rw-r--r--wbrana.txt51
-rw-r--r--wdzierzan.html96
-rw-r--r--wdzierzan.txt53
-rw-r--r--webos.html96
-rw-r--r--webos.txt53
-rw-r--r--weuxel.html92
-rw-r--r--weuxel.txt51
-rw-r--r--what4-java.html92
-rw-r--r--what4-java.txt51
-rw-r--r--wichtounet.html90
-rw-r--r--wichtounet.txt50
-rw-r--r--wine.html94
-rw-r--r--wine.txt52
-rw-r--r--winny.html90
-rw-r--r--winny.txt50
-rw-r--r--wjn-overlay.html96
-rw-r--r--wjn-overlay.txt50
-rw-r--r--wuodan.html94
-rw-r--r--wuodan.txt50
-rw-r--r--x11.html88
-rw-r--r--x11.txt49
-rw-r--r--xdch47.html90
-rw-r--r--xdch47.txt50
-rw-r--r--xelnor.html98
-rw-r--r--xelnor.txt54
-rw-r--r--xoreos.html94
-rw-r--r--xoreos.txt52
-rw-r--r--xwing.html126
-rw-r--r--xwing.txt72
-rw-r--r--yandex.html80
-rw-r--r--yandex.txt45
-rw-r--r--yoreek.html82
-rw-r--r--yoreek.txt46
-rw-r--r--youbroketheinternet.html88
-rw-r--r--youbroketheinternet.txt48
-rw-r--r--yurij-overlay.html74
-rw-r--r--yurij-overlay.txt42
-rw-r--r--yuzu-overlay.html88
-rw-r--r--yuzu-overlay.txt44
-rw-r--r--zerodaysfordays.html80
-rw-r--r--zerodaysfordays.txt45
-rw-r--r--zscheile.html80
-rw-r--r--zscheile.txt45
-rw-r--r--zugaina.html114
-rw-r--r--zugaina.txt49
-rw-r--r--zx2c4.html84
-rw-r--r--zx2c4.txt47
-rw-r--r--zyrenth.html80
-rw-r--r--zyrenth.txt45
822 files changed, 16411 insertions, 40608 deletions
diff --git a/0bs1d1an.html b/0bs1d1an.html
index c11833a84361..8b9caa4d8956 100644
--- a/0bs1d1an.html
+++ b/0bs1d1an.html
@@ -36,27 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync 0bs1d1an
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync 0bs1d1an
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing 0bs1d1an
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing 0bs1d1an
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;...
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced 0bs1d1an
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 0bs1d1an
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="err" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * net-misc/urlscan-0.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced 0bs1d1an
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 0bs1d1an
+</pre></td></tr>
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-misc/urlscan-0.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/0bs1d1an.txt b/0bs1d1an.txt
index 14c7b9c8e3a0..87094925298c 100644
--- a/0bs1d1an.txt
+++ b/0bs1d1an.txt
@@ -11,10 +11,22 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync 0bs1d1an
*** syncing 0bs1d1an
-Cloning into '/var/lib/repo-mirror-ci/sync/0bs1d1an'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced 0bs1d1an
* Sync succeeded
$ git log --format=%ci -1
diff --git a/2xsaiko.html b/2xsaiko.html
index 5ca69d905265..f7f7ddde5aab 100644
--- a/2xsaiko.html
+++ b/2xsaiko.html
@@ -32,25 +32,49 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync 2xsaiko
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync 2xsaiko
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing 2xsaiko
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing 2xsaiko
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;...
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced 2xsaiko
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 2xsaiko
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced 2xsaiko
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 2xsaiko
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/2xsaiko.txt b/2xsaiko.txt
index 485b34420d5c..6c7e8899d0df 100644
--- a/2xsaiko.txt
+++ b/2xsaiko.txt
@@ -9,10 +9,22 @@
'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~dblsaiko/ebuilds'},
{'type': 'git', 'uri': 'git@git.sr.ht:~dblsaiko/ebuilds'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync 2xsaiko
*** syncing 2xsaiko
-Cloning into '/var/lib/repo-mirror-ci/sync/2xsaiko'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced 2xsaiko
* Sync succeeded
$ git log --format=%ci -1
diff --git a/4nykey.html b/4nykey.html
index 9691787a1c76..fe7331ca5490 100644
--- a/4nykey.html
+++ b/4nykey.html
@@ -34,25 +34,49 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync 4nykey
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync 4nykey
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing 4nykey
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing 4nykey
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;...
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** synced 4nykey
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 4nykey
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced 4nykey
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 4nykey
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/4nykey.txt b/4nykey.txt
index 3677a287287a..e287ceeeb1ac 100644
--- a/4nykey.txt
+++ b/4nykey.txt
@@ -10,10 +10,22 @@
{'type': 'git', 'uri': 'git://github.com/4nykey/4nykey.git'},
{'type': 'git', 'uri': 'git@github.com:4nykey/4nykey.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync 4nykey
*** syncing 4nykey
-Cloning into '/var/lib/repo-mirror-ci/sync/4nykey'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced 4nykey
* Sync succeeded
$ git log --format=%ci -1
diff --git a/AlexandreFournier.html b/AlexandreFournier.html
index e7063e365236..e915acbbb407 100644
--- a/AlexandreFournier.html
+++ b/AlexandreFournier.html
@@ -40,25 +40,49 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync AlexandreFournier
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync AlexandreFournier
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AlexandreFournier
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing AlexandreFournier
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced AlexandreFournier
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AlexandreFournier
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced AlexandreFournier
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AlexandreFournier
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/AlexandreFournier.txt b/AlexandreFournier.txt
index 38bfd9bf25ce..f3637d060797 100644
--- a/AlexandreFournier.txt
+++ b/AlexandreFournier.txt
@@ -13,10 +13,22 @@
{'type': 'git',
'uri': 'git@github.com:AlexandreFournier/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync AlexandreFournier
*** syncing AlexandreFournier
-Cloning into '/var/lib/repo-mirror-ci/sync/AlexandreFournier'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced AlexandreFournier
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ArchFeh.html b/ArchFeh.html
index 96fe8b0d4386..119410fa4bfb 100644
--- a/ArchFeh.html
+++ b/ArchFeh.html
@@ -36,25 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ArchFeh
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ArchFeh
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ArchFeh
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ArchFeh
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;...
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced ArchFeh
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ArchFeh
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ArchFeh
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ArchFeh
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ArchFeh.txt b/ArchFeh.txt
index e41894a4428f..17e68a0ace50 100644
--- a/ArchFeh.txt
+++ b/ArchFeh.txt
@@ -11,10 +11,22 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ArchFeh
*** syncing ArchFeh
-Cloning into '/var/lib/repo-mirror-ci/sync/ArchFeh'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ArchFeh
* Sync succeeded
$ git log --format=%ci -1
diff --git a/AstroFloyd.html b/AstroFloyd.html
index 2a0fc76c866f..d06d05e58faa 100644
--- a/AstroFloyd.html
+++ b/AstroFloyd.html
@@ -40,25 +40,49 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync AstroFloyd
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync AstroFloyd
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AstroFloyd
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing AstroFloyd
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced AstroFloyd
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AstroFloyd
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced AstroFloyd
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AstroFloyd
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/AstroFloyd.txt b/AstroFloyd.txt
index ae8d32bb077e..cd1a5b85f8c4 100644
--- a/AstroFloyd.txt
+++ b/AstroFloyd.txt
@@ -13,10 +13,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/AstroFloyd.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync AstroFloyd
*** syncing AstroFloyd
-Cloning into '/var/lib/repo-mirror-ci/sync/AstroFloyd'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced AstroFloyd
* Sync succeeded
$ git log --format=%ci -1
diff --git a/AzP.html b/AzP.html
index a4ecf7d221af..3895bd1775ac 100644
--- a/AzP.html
+++ b/AzP.html
@@ -38,27 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync AzP
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync AzP
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing AzP
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing AzP
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;...
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced AzP
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AzP
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * games-action/subspacebattle-0.999: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced AzP
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 AzP
+</pre></td></tr>
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * games-action/subspacebattle-0.999: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/AzP.txt b/AzP.txt
index eaa670341b75..b9b7fd41917d 100644
--- a/AzP.txt
+++ b/AzP.txt
@@ -12,10 +12,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/AzP.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync AzP
*** syncing AzP
-Cloning into '/var/lib/repo-mirror-ci/sync/AzP'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced AzP
* Sync succeeded
$ git log --format=%ci -1
diff --git a/Case_Of.html b/Case_Of.html
index f9c01b181584..828bad5d769d 100644
--- a/Case_Of.html
+++ b/Case_Of.html
@@ -36,25 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync Case_Of
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync Case_Of
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing Case_Of
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing Case_Of
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;...
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced Case_Of
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 Case_Of
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced Case_Of
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 Case_Of
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/Case_Of.txt b/Case_Of.txt
index c99c942cce9d..0f793cd70926 100644
--- a/Case_Of.txt
+++ b/Case_Of.txt
@@ -11,10 +11,22 @@
{'type': 'git',
'uri': 'git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync Case_Of
*** syncing Case_Of
-Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced Case_Of
* Sync succeeded
$ git log --format=%ci -1
diff --git a/Drauthius.html b/Drauthius.html
index 5a3f864ebea4..775b57d6c445 100644
--- a/Drauthius.html
+++ b/Drauthius.html
@@ -40,25 +40,49 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync Drauthius
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync Drauthius
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing Drauthius
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing Drauthius
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced Drauthius
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 Drauthius
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced Drauthius
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 Drauthius
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/Drauthius.txt b/Drauthius.txt
index 0da6c1d71449..ff297d6ea184 100644
--- a/Drauthius.txt
+++ b/Drauthius.txt
@@ -13,10 +13,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/Drauthius.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync Drauthius
*** syncing Drauthius
-Cloning into '/var/lib/repo-mirror-ci/sync/Drauthius'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced Drauthius
* Sync succeeded
$ git log --format=%ci -1
diff --git a/DuPol.html b/DuPol.html
index f431ca27b41b..52b0cb1a5da7 100644
--- a/DuPol.html
+++ b/DuPol.html
@@ -34,35 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync DuPol
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync DuPol
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing DuPol
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing DuPol
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced DuPol
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 DuPol
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="err" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * x11-plugins/cd-plugins-core-3.0.1-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced DuPol
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 DuPol
+</pre></td></tr>
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * x11-plugins/cd-plugins-core-3.0.1-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * x11-plugins/cd-plugins-thirdparty-3.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * x11-plugins/cd-plugins-thirdparty-3.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/DuPol.txt b/DuPol.txt
index 3d5b65aabe6d..02a143ee1a55 100644
--- a/DuPol.txt
+++ b/DuPol.txt
@@ -10,13 +10,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/DuPol.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync DuPol
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing DuPol
-Cloning into '/var/lib/repo-mirror-ci/sync/DuPol'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced DuPol
* Sync succeeded
$ git log --format=%ci -1
diff --git a/FireBurn.html b/FireBurn.html
index 5a549dafd8e4..0f4ce5148163 100644
--- a/FireBurn.html
+++ b/FireBurn.html
@@ -30,265 +30,49 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync FireBurn
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync FireBurn
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing FireBurn
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing FireBurn
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;...
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** synced FireBurn
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 FireBurn
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7feb1d128d30&gt;
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Traceback (most recent call last):
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> self.ebp.disable_eclass_caching()
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> self.clear_preloaded_eclasses()
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> if self.is_responsive:
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced FireBurn
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> return self._consume_async_expects()
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 FireBurn
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;16931&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;16931&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;16931&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;16931&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;16931&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7feb1d81af70&gt;
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;16931&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/FireBurn.txt b/FireBurn.txt
index 9aac896a53e2..64a1eac55370 100644
--- a/FireBurn.txt
+++ b/FireBurn.txt
@@ -8,133 +8,25 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/FireBurn/Overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync FireBurn
*** syncing FireBurn
-Cloning into '/var/lib/repo-mirror-ci/sync/FireBurn'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced FireBurn
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 FireBurn
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7feb1d128d30>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '16931' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '16931' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '16931' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '16931' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '16931' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7feb1d81af70>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '16931' appears dead, timing out
* Cache regenerated successfully
diff --git a/HomeAssistantRepository.html b/HomeAssistantRepository.html
index d3ce81d08477..ed845ef38eff 100644
--- a/HomeAssistantRepository.html
+++ b/HomeAssistantRepository.html
@@ -36,25 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync HomeAssistantRepository
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync HomeAssistantRepository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing HomeAssistantRepository
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing HomeAssistantRepository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;...
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** synced HomeAssistantRepository
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 HomeAssistantRepository
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced HomeAssistantRepository
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 HomeAssistantRepository
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt
index 467bbe126f42..366210b54f13 100644
--- a/HomeAssistantRepository.txt
+++ b/HomeAssistantRepository.txt
@@ -11,10 +11,22 @@
{'type': 'git',
'uri': 'https://github.com/onkelbeh/HomeAssistantRepository.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync HomeAssistantRepository
*** syncing HomeAssistantRepository
-Cloning into '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced HomeAssistantRepository
* Sync succeeded
$ git log --format=%ci -1
diff --git a/JRG.html b/JRG.html
index 2411d193c304..94efca3fac8c 100644
--- a/JRG.html
+++ b/JRG.html
@@ -40,31 +40,49 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync JRG
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync JRG
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing JRG
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing JRG
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/JRG&#x27;...
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced JRG
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 JRG
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced JRG
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 JRG
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/JRG.txt b/JRG.txt
index 52a60191e6c6..9e1eab233fbe 100644
--- a/JRG.txt
+++ b/JRG.txt
@@ -13,13 +13,22 @@
{'type': 'git',
'uri': 'git@github.com:john-r-graham/jrg-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync JRG
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing JRG
-Cloning into '/var/lib/repo-mirror-ci/sync/JRG'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced JRG
* Sync succeeded
$ git log --format=%ci -1
diff --git a/KBrown-pub.html b/KBrown-pub.html
index 24f672e6a599..988c6cc4ea6f 100644
--- a/KBrown-pub.html
+++ b/KBrown-pub.html
@@ -36,29 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync KBrown-pub
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync KBrown-pub
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing KBrown-pub
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing KBrown-pub
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced KBrown-pub
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 KBrown-pub
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced KBrown-pub
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 KBrown-pub
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/KBrown-pub.txt b/KBrown-pub.txt
index 4db465403668..0b04f804c8ec 100644
--- a/KBrown-pub.txt
+++ b/KBrown-pub.txt
@@ -11,12 +11,22 @@
{'type': 'git',
'uri': 'https://github.com/KenjiBrown/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync KBrown-pub
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing KBrown-pub
-Cloning into '/var/lib/repo-mirror-ci/sync/KBrown-pub'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced KBrown-pub
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ROKO__.html b/ROKO__.html
index 83f3f70ca2b7..f096bc10e376 100644
--- a/ROKO__.html
+++ b/ROKO__.html
@@ -32,31 +32,49 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ROKO__
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ROKO__
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing ROKO__
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ROKO__
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;...
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced ROKO__
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ROKO__
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ROKO__
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ROKO__
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ROKO__.txt b/ROKO__.txt
index 2a3e9bd32b7a..869ff8016b3d 100644
--- a/ROKO__.txt
+++ b/ROKO__.txt
@@ -9,13 +9,22 @@
'source': [{'type': 'git', 'uri': 'https://github.com/sandikata/ROKO__.git'},
{'type': 'git', 'uri': 'git://github.com/sandikata/ROKO__.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ROKO__
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ROKO__
-Cloning into '/var/lib/repo-mirror-ci/sync/ROKO__'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ROKO__
* Sync succeeded
$ git log --format=%ci -1
diff --git a/R_Overlay.html b/R_Overlay.html
index ac240da7f277..bf1508467c74 100644
--- a/R_Overlay.html
+++ b/R_Overlay.html
@@ -30,65 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync R_Overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync R_Overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing R_Overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of files: 93,731 (reg: 76,480, dir: 17,251)
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of regular files transferred: 0
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing R_Overlay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total file size: 64.22M bytes
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Total transferred file size: 0 bytes
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Number of files: 93,731 (reg: 76,480, dir: 17,251)
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Literal data: 0 bytes
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Number of created files: 93,731 (reg: 76,480, dir: 17,251)
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Number of deleted files: 0
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 2.28M
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Number of regular files transferred: 76,480
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Total file size: 64.22M bytes
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total transferred file size: 64.22M bytes
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 17.80K
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Literal data: 64.22M bytes
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 2.70M
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Matched data: 0 bytes
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>File list size: 3.14M
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 17.80K bytes received 2.70M bytes 1.09M bytes/sec
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>File list generation time: 0.001 seconds
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 64.22M speedup is 23.60
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>File list transfer time: 0.000 seconds
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced R_Overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Total bytes sent: 1.53M
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Total bytes received: 43.93M
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 R_Overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>sent 1.53M bytes received 43.93M bytes 496.81K bytes/sec
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>total size is 64.22M speedup is 1.41
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced R_Overlay
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 R_Overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/R_Overlay.txt b/R_Overlay.txt
index b872b3bd79d3..6b576c1d808f 100644
--- a/R_Overlay.txt
+++ b/R_Overlay.txt
@@ -8,31 +8,25 @@
'source': [{'type': 'rsync',
'uri': 'rsync://roverlay.dev.gentoo.org/roverlay'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync R_Overlay
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing R_Overlay
Number of files: 93,731 (reg: 76,480, dir: 17,251)
-Number of created files: 93,731 (reg: 76,480, dir: 17,251)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 76,480
+Number of regular files transferred: 0
Total file size: 64.22M bytes
-Total transferred file size: 64.22M bytes
-Literal data: 64.22M bytes
+Total transferred file size: 0 bytes
+Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 3.14M
+File list size: 2.28M
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 1.53M
-Total bytes received: 43.93M
+Total bytes sent: 17.80K
+Total bytes received: 2.70M
-sent 1.53M bytes received 43.93M bytes 496.81K bytes/sec
-total size is 64.22M speedup is 1.41
+sent 17.80K bytes received 2.70M bytes 1.09M bytes/sec
+total size is 64.22M speedup is 23.60
*** synced R_Overlay
* Sync succeeded
$ stat --format=%y .
diff --git a/SwordArMor.html b/SwordArMor.html
index c7b96ea8d4c6..42496f7b8ce6 100644
--- a/SwordArMor.html
+++ b/SwordArMor.html
@@ -38,25 +38,15 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync SwordArMor
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing SwordArMor
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;...
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>fatal: unable to access &#x27;https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/&#x27;: The requested URL returned error: 500
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>!!! failed syncing SwordArMor
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing SwordArMor
-</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;...
-</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>fatal: unable to access &#x27;https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/&#x27;: The requested URL returned error: 500
-</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>!!! failed syncing SwordArMor
-</pre></td></tr>
- <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync failed with 1
+ <tr class="err" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Sync failed with 1
</pre></td><td>[FATAL]</td></tr>
</table>
diff --git a/SwordArMor.txt b/SwordArMor.txt
index 6b34ffcd48b2..6da8109d7e9c 100644
--- a/SwordArMor.txt
+++ b/SwordArMor.txt
@@ -12,11 +12,6 @@
'status': 'unofficial'}
* Adding new repository
$ pmaint sync SwordArMor
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing SwordArMor
Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'...
fatal: unable to access 'https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git/': The requested URL returned error: 500
diff --git a/ace.html b/ace.html
index 330dc048a3a3..c514f0d3d562 100644
--- a/ace.html
+++ b/ace.html
@@ -36,47 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ace
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ace
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ace
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ace
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;...
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ace
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ace
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ace
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ace
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ace.txt b/ace.txt
index a12881a7b252..a1614bf196d8 100644
--- a/ace.txt
+++ b/ace.txt
@@ -11,21 +11,22 @@
{'type': 'git', 'uri': 'git://github.com/ananace/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:ananace/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ace
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ace
-Cloning into '/var/lib/repo-mirror-ci/sync/ace'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ace
* Sync succeeded
$ git log --format=%ci -1
diff --git a/activehome.html b/activehome.html
index dde1638e2faf..3b44cda3ca2c 100644
--- a/activehome.html
+++ b/activehome.html
@@ -46,41 +46,49 @@
</pre></td></tr>
<tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync activehome
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint sync activehome
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing activehome
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing activehome
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/activehome&#x27;...
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced activehome
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 activehome
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced activehome
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 activehome
+</pre></td></tr>
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/activehome.txt b/activehome.txt
index 17fb5920a115..fd1897aba4f7 100644
--- a/activehome.txt
+++ b/activehome.txt
@@ -16,18 +16,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/activehome.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync activehome
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing activehome
-Cloning into '/var/lib/repo-mirror-ci/sync/activehome'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced activehome
* Sync succeeded
$ git log --format=%ci -1
diff --git a/aeon-gentoo-overlay.html b/aeon-gentoo-overlay.html
index 513d78789a91..7b5291315550 100644
--- a/aeon-gentoo-overlay.html
+++ b/aeon-gentoo-overlay.html
@@ -36,41 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync aeon-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync aeon-gentoo-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing aeon-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing aeon-gentoo-overlay
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/aeon-gentoo-overlay&#x27;...
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced aeon-gentoo-overlay
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 aeon-gentoo-overlay
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced aeon-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 aeon-gentoo-overlay
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/aeon-gentoo-overlay.txt b/aeon-gentoo-overlay.txt
index e63da8c6ae6a..3ab9b5491502 100644
--- a/aeon-gentoo-overlay.txt
+++ b/aeon-gentoo-overlay.txt
@@ -11,18 +11,22 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync aeon-gentoo-overlay
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing aeon-gentoo-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/aeon-gentoo-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced aeon-gentoo-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ag-ops.html b/ag-ops.html
index a1d804d63e89..35dc42660651 100644
--- a/ag-ops.html
+++ b/ag-ops.html
@@ -34,47 +34,49 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ag-ops
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ag-ops
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ag-ops
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing ag-ops
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ag-ops&#x27;...
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ag-ops
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ag-ops
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ag-ops
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ag-ops
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ag-ops.txt b/ag-ops.txt
index bca9d2d373db..e74f6e86a96c 100644
--- a/ag-ops.txt
+++ b/ag-ops.txt
@@ -10,21 +10,22 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/ILMostro/ag-ops.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ag-ops
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ag-ops
-Cloning into '/var/lib/repo-mirror-ci/sync/ag-ops'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ag-ops
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ago.html b/ago.html
index 2bc69ee482bd..3f6997e3a043 100644
--- a/ago.html
+++ b/ago.html
@@ -36,47 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ago
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ago
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ago
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing ago
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;...
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ago
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ago
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ago
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ago
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ago.txt b/ago.txt
index f21d2e60478d..55f717dacac0 100644
--- a/ago.txt
+++ b/ago.txt
@@ -11,21 +11,22 @@
{'type': 'git', 'uri': 'git://anongit.gentoo.org/dev/ago.git'},
{'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/dev/ago.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync ago
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ago
-Cloning into '/var/lib/repo-mirror-ci/sync/ago'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ago
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ahyangyi-overlay.html b/ahyangyi-overlay.html
index 1dfad472d650..1035012439d2 100644
--- a/ahyangyi-overlay.html
+++ b/ahyangyi-overlay.html
@@ -32,49 +32,57 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ahyangyi-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ahyangyi-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing ahyangyi-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** syncing ahyangyi-overlay
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ahyangyi-overlay&#x27;...
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** synced ahyangyi-overlay
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ahyangyi-overlay
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced ahyangyi-overlay
</pre></td></tr>
- <tr class="err" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * dev-libs/caffe-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ahyangyi-overlay
+</pre></td></tr>
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-libs/caffe-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * media-gfx/afdko-2.5.65781: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-gfx/afdko-2.5.65781: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * media-libs/allegro-9999: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-libs/allegro-9999: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * net-misc/google-images-download-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-misc/google-images-download-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/ahyangyi-overlay.txt b/ahyangyi-overlay.txt
index b19a6b224cb4..0bb4fb14b51f 100644
--- a/ahyangyi-overlay.txt
+++ b/ahyangyi-overlay.txt
@@ -9,18 +9,22 @@
'source': [{'type': 'git',
'uri': 'https://github.com/ahyangyi/ahyangyi-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ahyangyi-overlay
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ahyangyi-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ahyangyi-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ahyangyi-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/alatar-lay.html b/alatar-lay.html
index 26b8688cb25d..424f9b2c60f8 100644
--- a/alatar-lay.html
+++ b/alatar-lay.html
@@ -32,31 +32,49 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync alatar-lay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync alatar-lay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing alatar-lay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing alatar-lay
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/alatar-lay&#x27;...
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** synced alatar-lay
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alatar-lay
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced alatar-lay
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alatar-lay
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/alatar-lay.txt b/alatar-lay.txt
index 0d8860d73d51..a683dc689e63 100644
--- a/alatar-lay.txt
+++ b/alatar-lay.txt
@@ -9,13 +9,22 @@
{'type': 'git', 'uri': 'git://github.com/alatarum/alatar-lay.git'},
{'type': 'git', 'uri': 'git@github.com:alatarum/alatar-lay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync alatar-lay
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing alatar-lay
-Cloning into '/var/lib/repo-mirror-ci/sync/alatar-lay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced alatar-lay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/alesharik.html b/alesharik.html
index 0df89bb1da9b..16bb6456c4aa 100644
--- a/alesharik.html
+++ b/alesharik.html
@@ -34,31 +34,49 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync alesharik
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync alesharik
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing alesharik
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing alesharik
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/alesharik&#x27;...
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** synced alesharik
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alesharik
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced alesharik
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alesharik
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/alesharik.txt b/alesharik.txt
index 6eab123c6947..f882ef61532a 100644
--- a/alesharik.txt
+++ b/alesharik.txt
@@ -10,13 +10,22 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/alesharik/alesharik-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync alesharik
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing alesharik
-Cloning into '/var/lib/repo-mirror-ci/sync/alesharik'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced alesharik
* Sync succeeded
$ git log --format=%ci -1
diff --git a/alexcepoi.html b/alexcepoi.html
index 5f639a2a72c5..0c80eb7fed1e 100644
--- a/alexcepoi.html
+++ b/alexcepoi.html
@@ -40,31 +40,49 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync alexcepoi
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync alexcepoi
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing alexcepoi
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing alexcepoi
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;...
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced alexcepoi
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alexcepoi
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced alexcepoi
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alexcepoi
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/alexcepoi.txt b/alexcepoi.txt
index 0ddcb8f06cec..f62c0d349677 100644
--- a/alexcepoi.txt
+++ b/alexcepoi.txt
@@ -13,13 +13,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/alexcepoi.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync alexcepoi
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing alexcepoi
-Cloning into '/var/lib/repo-mirror-ci/sync/alexcepoi'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced alexcepoi
* Sync succeeded
$ git log --format=%ci -1
diff --git a/alexxy.html b/alexxy.html
index e148f18963f9..1cd6b266f5e6 100644
--- a/alexxy.html
+++ b/alexxy.html
@@ -38,33 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync alexxy
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync alexxy
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing alexxy
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing alexxy
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;...
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced alexxy
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alexxy
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="err" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * dev-tex/cpssp-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced alexxy
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alexxy
+</pre></td></tr>
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-tex/cpssp-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/alexxy.txt b/alexxy.txt
index a0ecb230a0d9..43c8775a8868 100644
--- a/alexxy.txt
+++ b/alexxy.txt
@@ -12,13 +12,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/alexxy.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync alexxy
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing alexxy
-Cloning into '/var/lib/repo-mirror-ci/sync/alexxy'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced alexxy
* Sync succeeded
$ git log --format=%ci -1
diff --git a/aluco.html b/aluco.html
index 093f13692036..20f3ee0ce5c4 100644
--- a/aluco.html
+++ b/aluco.html
@@ -38,31 +38,49 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync aluco
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync aluco
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing aluco
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing aluco
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;...
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>*** synced aluco
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 aluco
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced aluco
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 aluco
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/aluco.txt b/aluco.txt
index 7da555efea7d..7edaf0a4e977 100644
--- a/aluco.txt
+++ b/aluco.txt
@@ -12,13 +12,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/aluco.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync aluco
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing aluco
-Cloning into '/var/lib/repo-mirror-ci/sync/aluco'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced aluco
* Sync succeeded
$ git log --format=%ci -1
diff --git a/alxu.html b/alxu.html
index 288d18733906..86da187d125c 100644
--- a/alxu.html
+++ b/alxu.html
@@ -30,81 +30,49 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync alxu
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync alxu
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing alxu
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:JRG repo at &#x27;/var/lib/repo-mirror-ci/sync/JRG&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced alxu
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:R_Overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/R_Overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ace repo at &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:activehome repo at &#x27;/var/lib/repo-mirror-ci/sync/activehome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alxu
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:aeon-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/aeon-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ag-ops repo at &#x27;/var/lib/repo-mirror-ci/sync/ag-ops&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ahyangyi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ahyangyi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alatar-lay repo at &#x27;/var/lib/repo-mirror-ci/sync/alatar-lay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alesharik repo at &#x27;/var/lib/repo-mirror-ci/sync/alesharik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** syncing alxu
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;...
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced alxu
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alxu
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/alxu.txt b/alxu.txt
index 42251c328311..4d1f5e00917f 100644
--- a/alxu.txt
+++ b/alxu.txt
@@ -8,38 +8,22 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://git.alxu.ca/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync alxu
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:JRG repo at '/var/lib/repo-mirror-ci/sync/JRG', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:R_Overlay repo at '/var/lib/repo-mirror-ci/sync/R_Overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ace repo at '/var/lib/repo-mirror-ci/sync/ace', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aeon-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/aeon-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ahyangyi-overlay repo at '/var/lib/repo-mirror-ci/sync/ahyangyi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alatar-lay repo at '/var/lib/repo-mirror-ci/sync/alatar-lay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alesharik repo at '/var/lib/repo-mirror-ci/sync/alesharik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing alxu
-Cloning into '/var/lib/repo-mirror-ci/sync/alxu'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced alxu
* Sync succeeded
$ git log --format=%ci -1
diff --git a/amedeos.html b/amedeos.html
index 918b643d46e8..c2fe8794479b 100644
--- a/amedeos.html
+++ b/amedeos.html
@@ -36,47 +36,49 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync amedeos
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync amedeos
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing amedeos
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing amedeos
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/amedeos&#x27;...
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced amedeos
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced amedeos
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 amedeos
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 amedeos
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/amedeos.txt b/amedeos.txt
index 20464db78c4d..dd4f315fc184 100644
--- a/amedeos.txt
+++ b/amedeos.txt
@@ -11,21 +11,22 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/amedeos/amedeos-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync amedeos
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing amedeos
-Cloning into '/var/lib/repo-mirror-ci/sync/amedeos'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced amedeos
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anarchy.html b/anarchy.html
index 9b15f54e9861..5e40e3b4e54e 100644
--- a/anarchy.html
+++ b/anarchy.html
@@ -38,67 +38,49 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync anarchy
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync anarchy
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing anarchy
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:JRG repo at &#x27;/var/lib/repo-mirror-ci/sync/JRG&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced anarchy
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:alatar-lay repo at &#x27;/var/lib/repo-mirror-ci/sync/alatar-lay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alesharik repo at &#x27;/var/lib/repo-mirror-ci/sync/alesharik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anarchy
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing anarchy
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;...
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced anarchy
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anarchy
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/anarchy.txt b/anarchy.txt
index cccfbca8e66d..6cc8358d1bd5 100644
--- a/anarchy.txt
+++ b/anarchy.txt
@@ -12,31 +12,22 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/anarchy.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync anarchy
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:JRG repo at '/var/lib/repo-mirror-ci/sync/JRG', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alatar-lay repo at '/var/lib/repo-mirror-ci/sync/alatar-lay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alesharik repo at '/var/lib/repo-mirror-ci/sync/alesharik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anarchy
-Cloning into '/var/lib/repo-mirror-ci/sync/anarchy'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anarchy
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anard.html b/anard.html
index 0842ceb6cae8..2241a259caa8 100644
--- a/anard.html
+++ b/anard.html
@@ -32,69 +32,49 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync anard
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync anard
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing anard
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AlexandreFournier repo at &#x27;/var/lib/repo-mirror-ci/sync/AlexandreFournier&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ArchFeh repo at &#x27;/var/lib/repo-mirror-ci/sync/ArchFeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:JRG repo at &#x27;/var/lib/repo-mirror-ci/sync/JRG&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced anard
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ahyangyi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ahyangyi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alatar-lay repo at &#x27;/var/lib/repo-mirror-ci/sync/alatar-lay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alesharik repo at &#x27;/var/lib/repo-mirror-ci/sync/alesharik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anard
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing anard
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anard&#x27;...
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced anard
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anard
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/anard.txt b/anard.txt
index 0d0ffb12a61f..632c945bed40 100644
--- a/anard.txt
+++ b/anard.txt
@@ -9,32 +9,22 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Anard/anard-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync anard
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ArchFeh repo at '/var/lib/repo-mirror-ci/sync/ArchFeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:JRG repo at '/var/lib/repo-mirror-ci/sync/JRG', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ahyangyi-overlay repo at '/var/lib/repo-mirror-ci/sync/ahyangyi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alatar-lay repo at '/var/lib/repo-mirror-ci/sync/alatar-lay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alesharik repo at '/var/lib/repo-mirror-ci/sync/alesharik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anard
-Cloning into '/var/lib/repo-mirror-ci/sync/anard'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anard
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anaximander.html b/anaximander.html
index 0890216e5d71..4d551a044ea2 100644
--- a/anaximander.html
+++ b/anaximander.html
@@ -40,97 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync anaximander
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync anaximander
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing anaximander
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ace repo at &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:activehome repo at &#x27;/var/lib/repo-mirror-ci/sync/activehome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced anaximander
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anaximander
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ace repo at &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing anaximander
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced anaximander
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anaximander
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/anaximander.txt b/anaximander.txt
index b6cdacf3a75b..53ff5b031fed 100644
--- a/anaximander.txt
+++ b/anaximander.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/anaximander.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync anaximander
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ace repo at '/var/lib/repo-mirror-ci/sync/ace', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ace repo at '/var/lib/repo-mirror-ci/sync/ace', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anaximander
-Cloning into '/var/lib/repo-mirror-ci/sync/anaximander'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anaximander
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anders-larsson.html b/anders-larsson.html
index 2c26c6210f98..241b2c1f37c5 100644
--- a/anders-larsson.html
+++ b/anders-larsson.html
@@ -30,97 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync anders-larsson
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync anders-larsson
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:0bs1d1an repo at &#x27;/var/lib/repo-mirror-ci/sync/0bs1d1an&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing anders-larsson
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:2xsaiko repo at &#x27;/var/lib/repo-mirror-ci/sync/2xsaiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:4nykey repo at &#x27;/var/lib/repo-mirror-ci/sync/4nykey&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Drauthius repo at &#x27;/var/lib/repo-mirror-ci/sync/Drauthius&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:KBrown-pub repo at &#x27;/var/lib/repo-mirror-ci/sync/KBrown-pub&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ace repo at &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:activehome repo at &#x27;/var/lib/repo-mirror-ci/sync/activehome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced anders-larsson
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anders-larsson
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:FireBurn repo at &#x27;/var/lib/repo-mirror-ci/sync/FireBurn&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ace repo at &#x27;/var/lib/repo-mirror-ci/sync/ace&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing anders-larsson
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced anders-larsson
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anders-larsson
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/anders-larsson.txt b/anders-larsson.txt
index c513675ce261..b505e1e20b0f 100644
--- a/anders-larsson.txt
+++ b/anders-larsson.txt
@@ -8,46 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/anders-larsson/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync anders-larsson
-WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ace repo at '/var/lib/repo-mirror-ci/sync/ace', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:activehome repo at '/var/lib/repo-mirror-ci/sync/activehome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ace repo at '/var/lib/repo-mirror-ci/sync/ace', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anders-larsson
-Cloning into '/var/lib/repo-mirror-ci/sync/anders-larsson'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anders-larsson
* Sync succeeded
$ git log --format=%ci -1
diff --git a/andrey_utkin.html b/andrey_utkin.html
index 8e3b581d9609..7f6a3565eeff 100644
--- a/andrey_utkin.html
+++ b/andrey_utkin.html
@@ -36,81 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync andrey_utkin
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync andrey_utkin
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing andrey_utkin
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced andrey_utkin
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 andrey_utkin
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing andrey_utkin
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced andrey_utkin
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 andrey_utkin
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/andrey_utkin.txt b/andrey_utkin.txt
index 131a990146fb..91994b471d47 100644
--- a/andrey_utkin.txt
+++ b/andrey_utkin.txt
@@ -11,38 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync andrey_utkin
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing andrey_utkin
-Cloning into '/var/lib/repo-mirror-ci/sync/andrey_utkin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced andrey_utkin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anomen.html b/anomen.html
index 6d1dbc9efcba..343653aa2c4c 100644
--- a/anomen.html
+++ b/anomen.html
@@ -36,83 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync anomen
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync anomen
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing anomen
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced anomen
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anomen
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing anomen
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced anomen
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anomen
-</pre></td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-fonts/tahoma-1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-fonts/tahoma-1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/anomen.txt b/anomen.txt
index 4568d970f4d8..2c3d2b4e6b2e 100644
--- a/anomen.txt
+++ b/anomen.txt
@@ -11,38 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:anomen-s/anomen-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync anomen
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anomen
-Cloning into '/var/lib/repo-mirror-ci/sync/anomen'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anomen
* Sync succeeded
$ git log --format=%ci -1
diff --git a/anyc.html b/anyc.html
index 7a8f771704d2..85963a641396 100644
--- a/anyc.html
+++ b/anyc.html
@@ -34,119 +34,89 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync anyc
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync anyc
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing anyc
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced anyc
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anyc
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing anyc
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced anyc
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 anyc
-</pre></td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-misc/avahi-tray-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-misc/avahi-tray-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-misc/mplugd-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-misc/mplugd-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-misc/usb-creator-0.3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-misc/usb-creator-0.3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/python-axolotl-0.1.7_p1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/python-axolotl-0.1.7_p1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/python-axolotl-0.1.35: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/python-axolotl-0.1.35: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/python-networkmanager-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/python-networkmanager-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/python-omemo-0.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/python-omemo-0.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/python-omemo-0.1.0_p20160225: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/python-omemo-0.1.0_p20160225: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/python-omemo-0.1.0_p20160402: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/python-omemo-0.1.0_p20160402: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/python-xmp-toolkit-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/python-xmp-toolkit-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-vcs/git-repo-1.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-vcs/git-repo-1.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * games-puzzle/londonlaw-0.3.0_pre2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * games-puzzle/londonlaw-0.3.0_pre2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * games-puzzle/londonlaw-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * games-puzzle/londonlaw-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * net-im/gajim-omemo-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * net-im/gajim-omemo-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-im/gajim-omemo-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-im/gajim-omemo-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * net-im/gajim-omemo-0.5.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-im/gajim-omemo-0.5.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * net-misc/radssh-1.0.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/radssh-1.0.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * net-misc/radssh-1.0.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/radssh-1.0.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * sys-fs/bmap-tools-3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * sys-fs/bmap-tools-3.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/anyc.txt b/anyc.txt
index 7829781e0040..62bf3c17faca 100644
--- a/anyc.txt
+++ b/anyc.txt
@@ -10,38 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/anyc/anyc-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:anyc/anyc-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync anyc
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing anyc
-Cloning into '/var/lib/repo-mirror-ci/sync/anyc'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced anyc
* Sync succeeded
$ git log --format=%ci -1
diff --git a/apriluwu.html b/apriluwu.html
index 30c9679b879c..1033d1b280cb 100644
--- a/apriluwu.html
+++ b/apriluwu.html
@@ -36,79 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync apriluwu
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync apriluwu
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing apriluwu
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alexcepoi repo at &#x27;/var/lib/repo-mirror-ci/sync/alexcepoi&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced apriluwu
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 apriluwu
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing apriluwu
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced apriluwu
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 apriluwu
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/apriluwu.txt b/apriluwu.txt
index cdee4a493d7f..9f70b371da31 100644
--- a/apriluwu.txt
+++ b/apriluwu.txt
@@ -11,37 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/apriluwu/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync apriluwu
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexcepoi repo at '/var/lib/repo-mirror-ci/sync/alexcepoi', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing apriluwu
-Cloning into '/var/lib/repo-mirror-ci/sync/apriluwu'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced apriluwu
* Sync succeeded
$ git log --format=%ci -1
diff --git a/archenroot.html b/archenroot.html
index a62f4c77473c..c62e2cb763fb 100644
--- a/archenroot.html
+++ b/archenroot.html
@@ -36,89 +36,57 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync archenroot
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync archenroot
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing archenroot
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced archenroot
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 archenroot
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing archenroot
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced archenroot
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 archenroot
-</pre></td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-editors/atom-1.28.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-editors/atom-1.28.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-util/pykickstart-1.99.54: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-util/pykickstart-1.99.54: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/pykickstart-1.99.66.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-util/pykickstart-1.99.66.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/archenroot.txt b/archenroot.txt
index 544d06a15e77..e0237c2fc1ca 100644
--- a/archenroot.txt
+++ b/archenroot.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/archenroot/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync archenroot
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing archenroot
-Cloning into '/var/lib/repo-mirror-ci/sync/archenroot'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced archenroot
* Sync succeeded
$ git log --format=%ci -1
diff --git a/argent-main.html b/argent-main.html
index bdf62defedfd..ca27bbbabb6e 100644
--- a/argent-main.html
+++ b/argent-main.html
@@ -32,105 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync argent-main
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync argent-main
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing argent-main
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced argent-main
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 argent-main
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing argent-main
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating files: 91% (8597/9346)
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Updating files: 92% (8599/9346)
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Updating files: 93% (8692/9346)
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Updating files: 94% (8786/9346)
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Updating files: 95% (8879/9346)
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Updating files: 96% (8973/9346)
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Updating files: 97% (9066/9346)
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Updating files: 98% (9160/9346)
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Updating files: 99% (9253/9346)
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Updating files: 100% (9346/9346)
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Updating files: 100% (9346/9346), done.
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced argent-main
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 argent-main
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/argent-main.txt b/argent-main.txt
index 6b389555e440..95f6ad75a241 100644
--- a/argent-main.txt
+++ b/argent-main.txt
@@ -9,40 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/argent/argent-main.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync argent-main
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing argent-main
-Cloning into '/var/lib/repo-mirror-ci/sync/argent-main'...
-Updating files: 91% (8597/9346) Updating files: 92% (8599/9346) Updating files: 93% (8692/9346) Updating files: 94% (8786/9346) Updating files: 95% (8879/9346) Updating files: 96% (8973/9346) Updating files: 97% (9066/9346) Updating files: 98% (9160/9346) Updating files: 99% (9253/9346) Updating files: 100% (9346/9346) Updating files: 100% (9346/9346), done.
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced argent-main
* Sync succeeded
$ git log --format=%ci -1
diff --git a/arx-libertatis.html b/arx-libertatis.html
index e29900a52d72..5aa6d0abbce0 100644
--- a/arx-libertatis.html
+++ b/arx-libertatis.html
@@ -30,81 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync arx-libertatis
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync arx-libertatis
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing arx-libertatis
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:aluco repo at &#x27;/var/lib/repo-mirror-ci/sync/aluco&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced arx-libertatis
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 arx-libertatis
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** syncing arx-libertatis
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;...
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced arx-libertatis
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 arx-libertatis
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/arx-libertatis.txt b/arx-libertatis.txt
index 6d046f6be05e..86769cc8ea07 100644
--- a/arx-libertatis.txt
+++ b/arx-libertatis.txt
@@ -8,38 +8,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/arx/ArxGentoo.git'},
{'type': 'git', 'uri': 'git://github.com/arx/ArxGentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync arx-libertatis
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:aluco repo at '/var/lib/repo-mirror-ci/sync/aluco', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing arx-libertatis
-Cloning into '/var/lib/repo-mirror-ci/sync/arx-libertatis'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced arx-libertatis
* Sync succeeded
$ git log --format=%ci -1
diff --git a/audio-overlay.html b/audio-overlay.html
index 5affc4759103..61d0f313fbba 100644
--- a/audio-overlay.html
+++ b/audio-overlay.html
@@ -44,93 +44,51 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync audio-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync audio-overlay
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing audio-overlay
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced audio-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 audio-overlay
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing audio-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced audio-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 audio-overlay
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/audio-overlay.txt b/audio-overlay.txt
index 5323065ad1b1..2862c80215db 100644
--- a/audio-overlay.txt
+++ b/audio-overlay.txt
@@ -15,44 +15,23 @@
{'type': 'git',
'uri': 'git@github.com:gentoo-audio/audio-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync audio-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing audio-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/audio-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced audio-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/average.html b/average.html
index 70dce040089f..7c3d956cd60e 100644
--- a/average.html
+++ b/average.html
@@ -38,87 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync average
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync average
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing average
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:DuPol repo at &#x27;/var/lib/repo-mirror-ci/sync/DuPol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ago repo at &#x27;/var/lib/repo-mirror-ci/sync/ago&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:alexxy repo at &#x27;/var/lib/repo-mirror-ci/sync/alexxy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anders-larsson repo at &#x27;/var/lib/repo-mirror-ci/sync/anders-larsson&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced average
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 average
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing average
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced average
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 average
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/average.txt b/average.txt
index ec2e20581975..41b6aabcaeec 100644
--- a/average.txt
+++ b/average.txt
@@ -12,41 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/AnAverageHuman/average.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync average
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ago repo at '/var/lib/repo-mirror-ci/sync/ago', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anders-larsson repo at '/var/lib/repo-mirror-ci/sync/anders-larsson', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing average
-Cloning into '/var/lib/repo-mirror-ci/sync/average'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced average
* Sync succeeded
$ git log --format=%ci -1
diff --git a/awesome.html b/awesome.html
index 497d2fad5c53..1ea098cdfa10 100644
--- a/awesome.html
+++ b/awesome.html
@@ -30,87 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync awesome
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync awesome
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing awesome
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced awesome
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing awesome
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced awesome
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/awesome.txt b/awesome.txt
index 044bde217519..7175b961b43a 100644
--- a/awesome.txt
+++ b/awesome.txt
@@ -8,41 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync awesome
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing awesome
-Cloning into '/var/lib/repo-mirror-ci/sync/awesome'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced awesome
* Sync succeeded
$ git log --format=%ci -1
diff --git a/barnowl.html b/barnowl.html
index a0ef7449d5b5..e5ed0fd67c61 100644
--- a/barnowl.html
+++ b/barnowl.html
@@ -36,87 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync barnowl
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync barnowl
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing barnowl
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced barnowl
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 barnowl
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing barnowl
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced barnowl
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 barnowl
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/barnowl.txt b/barnowl.txt
index 22bc7dad41a8..a183704f41f2 100644
--- a/barnowl.txt
+++ b/barnowl.txt
@@ -11,41 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/wthrowe/barnowl-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync barnowl
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing barnowl
-Cloning into '/var/lib/repo-mirror-ci/sync/barnowl'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced barnowl
* Sync succeeded
$ git log --format=%ci -1
diff --git a/beatussum-overlay.html b/beatussum-overlay.html
index 10fdee7fc2a3..391ca8fdc690 100644
--- a/beatussum-overlay.html
+++ b/beatussum-overlay.html
@@ -56,87 +56,51 @@
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint sync beatussum-overlay
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint sync beatussum-overlay
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing beatussum-overlay
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced beatussum-overlay
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 beatussum-overlay
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing beatussum-overlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced beatussum-overlay
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 beatussum-overlay
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/beatussum-overlay.txt b/beatussum-overlay.txt
index 77006cd36d2f..36294860f2a1 100644
--- a/beatussum-overlay.txt
+++ b/beatussum-overlay.txt
@@ -21,41 +21,23 @@
{'type': 'git',
'uri': 'ssh://git@github.com/beatussum/beatussum-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync beatussum-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing beatussum-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/beatussum-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced beatussum-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/benzene-overlay.html b/benzene-overlay.html
index 3fe3a2cdd398..03510ddd4abd 100644
--- a/benzene-overlay.html
+++ b/benzene-overlay.html
@@ -36,91 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync benzene-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync benzene-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing benzene-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced benzene-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 benzene-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing benzene-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced benzene-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 benzene-overlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/benzene-overlay.txt b/benzene-overlay.txt
index fc185125ffc4..008d3149f388 100644
--- a/benzene-overlay.txt
+++ b/benzene-overlay.txt
@@ -11,43 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Universebenzene/benzene-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync benzene-overlay
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing benzene-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/benzene-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced benzene-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bes.html b/bes.html
index bd9ef7e39c83..b06fb8d222bd 100644
--- a/bes.html
+++ b/bes.html
@@ -40,91 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bes
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bes
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bes
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bes
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bes
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing bes
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced bes
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bes
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bes.txt b/bes.txt
index a1efb80d9add..bde940b3bdee 100644
--- a/bes.txt
+++ b/bes.txt
@@ -13,43 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:bes-internal/gentoo-overlay-bes.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bes
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bes
-Cloning into '/var/lib/repo-mirror-ci/sync/bes'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bes
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bezerker.html b/bezerker.html
index c53a6342e606..48bbe75b3824 100644
--- a/bezerker.html
+++ b/bezerker.html
@@ -30,89 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bezerker
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync bezerker
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing bezerker
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced bezerker
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bezerker
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing bezerker
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced bezerker
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bezerker
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bezerker.txt b/bezerker.txt
index 5728c28fa8d6..639f905feb89 100644
--- a/bezerker.txt
+++ b/bezerker.txt
@@ -8,42 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/bezerker/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bezerker
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bezerker
-Cloning into '/var/lib/repo-mirror-ci/sync/bezerker'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bezerker
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bibletime.html b/bibletime.html
index 721d30753dc1..9361a7da235e 100644
--- a/bibletime.html
+++ b/bibletime.html
@@ -40,89 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bibletime
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bibletime
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AstroFloyd repo at &#x27;/var/lib/repo-mirror-ci/sync/AstroFloyd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bibletime
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anarchy repo at &#x27;/var/lib/repo-mirror-ci/sync/anarchy&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:andrey_utkin repo at &#x27;/var/lib/repo-mirror-ci/sync/andrey_utkin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bibletime
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bibletime
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing bibletime
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced bibletime
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bibletime
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bibletime.txt b/bibletime.txt
index c00ff36caf83..ee6924080a1b 100644
--- a/bibletime.txt
+++ b/bibletime.txt
@@ -13,42 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/bibletime.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bibletime
-WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anarchy repo at '/var/lib/repo-mirror-ci/sync/anarchy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:andrey_utkin repo at '/var/lib/repo-mirror-ci/sync/andrey_utkin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bibletime
-Cloning into '/var/lib/repo-mirror-ci/sync/bibletime'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bibletime
* Sync succeeded
$ git log --format=%ci -1
diff --git a/binaryden.html b/binaryden.html
index b64f26a171af..c2e0d108c7af 100644
--- a/binaryden.html
+++ b/binaryden.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync binaryden
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync binaryden
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing binaryden
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced binaryden
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 binaryden
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing binaryden
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced binaryden
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 binaryden
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/binaryden.txt b/binaryden.txt
index 62adad234641..82f1c88a17db 100644
--- a/binaryden.txt
+++ b/binaryden.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/tkemmer/binaryden.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync binaryden
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing binaryden
-Cloning into '/var/lib/repo-mirror-ci/sync/binaryden'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced binaryden
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bircoph.html b/bircoph.html
index c7ea9d04735c..4f6c38408c6d 100644
--- a/bircoph.html
+++ b/bircoph.html
@@ -38,101 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync bircoph
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bircoph
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing bircoph
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anyc repo at &#x27;/var/lib/repo-mirror-ci/sync/anyc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:arx-libertatis repo at &#x27;/var/lib/repo-mirror-ci/sync/arx-libertatis&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced bircoph
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bircoph
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing bircoph
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced bircoph
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bircoph
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bircoph.txt b/bircoph.txt
index a25d777aa200..9ad3e2f9bf1d 100644
--- a/bircoph.txt
+++ b/bircoph.txt
@@ -12,48 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/bircoph.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync bircoph
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anyc repo at '/var/lib/repo-mirror-ci/sync/anyc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:arx-libertatis repo at '/var/lib/repo-mirror-ci/sync/arx-libertatis', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bircoph
-Cloning into '/var/lib/repo-mirror-ci/sync/bircoph'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bircoph
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bitcetera.html b/bitcetera.html
index 5d4ae02dda9f..a9d06e384ee3 100644
--- a/bitcetera.html
+++ b/bitcetera.html
@@ -40,97 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bitcetera
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bitcetera
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bitcetera
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bitcetera
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bitcetera
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing bitcetera
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced bitcetera
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bitcetera
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bitcetera.txt b/bitcetera.txt
index a67a202aa41c..7adb6f2920c6 100644
--- a/bitcetera.txt
+++ b/bitcetera.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:svoop/bitcetera-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bitcetera
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bitcetera
-Cloning into '/var/lib/repo-mirror-ci/sync/bitcetera'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bitcetera
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bitcoin.html b/bitcoin.html
index 531e86ec66d2..1f5973244890 100644
--- a/bitcoin.html
+++ b/bitcoin.html
@@ -28,97 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync bitcoin
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bitcoin
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing bitcoin
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced bitcoin
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bitcoin
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing bitcoin
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced bitcoin
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bitcoin
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bitcoin.txt b/bitcoin.txt
index b1dea00f12d2..9bc2d60343a5 100644
--- a/bitcoin.txt
+++ b/bitcoin.txt
@@ -7,46 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://gitlab.com/bitcoin/gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bitcoin
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bitcoin
-Cloning into '/var/lib/repo-mirror-ci/sync/bitcoin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bitcoin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bleeding-edge.html b/bleeding-edge.html
index 3ec0609d6fac..c552e0fcf4b0 100644
--- a/bleeding-edge.html
+++ b/bleeding-edge.html
@@ -42,99 +42,55 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bleeding-edge
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync bleeding-edge
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing bleeding-edge
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced bleeding-edge
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bleeding-edge
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing bleeding-edge
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced bleeding-edge
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bleeding-edge
-</pre></td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-util/adobe-air-sdk-bin-2.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-util/adobe-air-sdk-bin-2.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-libs/jasper-2.0.14: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-libs/jasper-2.0.14: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/bleeding-edge.txt b/bleeding-edge.txt
index 4d0fc4ab9e94..c358e68ee091 100644
--- a/bleeding-edge.txt
+++ b/bleeding-edge.txt
@@ -14,45 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bleeding-edge
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bleeding-edge
-Cloning into '/var/lib/repo-mirror-ci/sync/bleeding-edge'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bleeding-edge
* Sync succeeded
$ git log --format=%ci -1
diff --git a/blender-gentoo-logo.html b/blender-gentoo-logo.html
index 950f0d9112d7..84235f9b4a69 100644
--- a/blender-gentoo-logo.html
+++ b/blender-gentoo-logo.html
@@ -38,95 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync blender-gentoo-logo
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync blender-gentoo-logo
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:AzP repo at &#x27;/var/lib/repo-mirror-ci/sync/AzP&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing blender-gentoo-logo
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:Case_Of repo at &#x27;/var/lib/repo-mirror-ci/sync/Case_Of&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:anomen repo at &#x27;/var/lib/repo-mirror-ci/sync/anomen&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:audio-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/audio-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:average repo at &#x27;/var/lib/repo-mirror-ci/sync/average&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:barnowl repo at &#x27;/var/lib/repo-mirror-ci/sync/barnowl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced blender-gentoo-logo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bezerker repo at &#x27;/var/lib/repo-mirror-ci/sync/bezerker&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 blender-gentoo-logo
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing blender-gentoo-logo
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced blender-gentoo-logo
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 blender-gentoo-logo
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/blender-gentoo-logo.txt b/blender-gentoo-logo.txt
index 25471d335f00..b59e954079a2 100644
--- a/blender-gentoo-logo.txt
+++ b/blender-gentoo-logo.txt
@@ -12,45 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync blender-gentoo-logo
-WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anomen repo at '/var/lib/repo-mirror-ci/sync/anomen', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:audio-overlay repo at '/var/lib/repo-mirror-ci/sync/audio-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:average repo at '/var/lib/repo-mirror-ci/sync/average', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:barnowl repo at '/var/lib/repo-mirror-ci/sync/barnowl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bezerker repo at '/var/lib/repo-mirror-ci/sync/bezerker', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing blender-gentoo-logo
-Cloning into '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced blender-gentoo-logo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bloody.html b/bloody.html
index 8d8759343eab..b42a1fa5bf3f 100644
--- a/bloody.html
+++ b/bloody.html
@@ -34,89 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync bloody
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync bloody
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing bloody
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced bloody
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bloody
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing bloody
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced bloody
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bloody
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bloody.txt b/bloody.txt
index 61807ab5e522..a24adc476484 100644
--- a/bloody.txt
+++ b/bloody.txt
@@ -10,42 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/bloodywing/bloody.git'},
{'type': 'git', 'uri': 'git@github.com:bloodywing/bloody.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bloody
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bloody
-Cloning into '/var/lib/repo-mirror-ci/sync/bloody'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bloody
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bobwya.html b/bobwya.html
index 5bdccbe7bd37..290332c1b744 100644
--- a/bobwya.html
+++ b/bobwya.html
@@ -40,87 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync bobwya
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync bobwya
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing bobwya
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced bobwya
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bobwya
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing bobwya
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced bobwya
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bobwya
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bobwya.txt b/bobwya.txt
index 89ac8c0216fc..c747c2b38d2b 100644
--- a/bobwya.txt
+++ b/bobwya.txt
@@ -13,41 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:bobwya/miscellaneous_ebuilds.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bobwya
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bobwya
-Cloning into '/var/lib/repo-mirror-ci/sync/bobwya'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bobwya
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bombo82.html b/bombo82.html
index ee4eedcc4c8f..5b79e03bbf76 100644
--- a/bombo82.html
+++ b/bombo82.html
@@ -36,91 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync bombo82
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync bombo82
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing bombo82
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:anaximander repo at &#x27;/var/lib/repo-mirror-ci/sync/anaximander&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:archenroot repo at &#x27;/var/lib/repo-mirror-ci/sync/archenroot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bes repo at &#x27;/var/lib/repo-mirror-ci/sync/bes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced bombo82
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bombo82
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing bombo82
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced bombo82
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bombo82
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bombo82.txt b/bombo82.txt
index fa12ac2c9d5c..d55d265ccd1d 100644
--- a/bombo82.txt
+++ b/bombo82.txt
@@ -11,43 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:bombo82/bombo82-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bombo82
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:archenroot repo at '/var/lib/repo-mirror-ci/sync/archenroot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bes repo at '/var/lib/repo-mirror-ci/sync/bes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bombo82
-Cloning into '/var/lib/repo-mirror-ci/sync/bombo82'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bombo82
* Sync succeeded
$ git log --format=%ci -1
diff --git a/booboo.html b/booboo.html
index c6cacf44eaae..90895f0e0625 100644
--- a/booboo.html
+++ b/booboo.html
@@ -30,139 +30,99 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync booboo
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync booboo
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing booboo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced booboo
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 booboo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing booboo
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced booboo
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 booboo
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-admin/sigar-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-admin/sigar-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-backup/obnam-1.19: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-backup/obnam-1.19: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-crypt/wotsap-0.7-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-crypt/wotsap-0.7-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-misc/crazyflie-clients-python-2019.01: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-misc/crazyflie-clients-python-2019.01: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-vim/pyclewn-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-vim/pyclewn-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-embedded/esptool-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-embedded/esptool-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-embedded/libmpsse-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-embedded/libmpsse-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-embedded/libmpsse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-embedded/libmpsse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-embedded/nodemcu-uploader-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-embedded/nodemcu-uploader-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-libs/libuecc-7: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-libs/libuecc-7: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/foolscap-0.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/foolscap-0.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/fs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/fs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/html2text-2015.4.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/html2text-2015.4.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/jsbeautifier-1.6.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/jsbeautifier-1.6.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * media-fonts/terminus-ttf-4.40.1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-fonts/terminus-ttf-4.40.1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * media-fonts/terminus-ttf-4.47.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-fonts/terminus-ttf-4.47.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * net-fs/tahoe-lafs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-fs/tahoe-lafs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * net-fs/tahoestaticfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-fs/tahoestaticfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * net-im/vk4xmpp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-im/vk4xmpp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-misc/Cetus-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/Cetus-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-misc/QtQuickVcp-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/QtQuickVcp-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * sys-fs/owfs-3.1_p0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * sys-fs/owfs-3.1_p0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * sys-fs/ubi_reader-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * sys-fs/ubi_reader-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/booboo.txt b/booboo.txt
index aec024b747aa..54f48abda170 100644
--- a/booboo.txt
+++ b/booboo.txt
@@ -8,43 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/l29ah/booboo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync booboo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing booboo
-Cloning into '/var/lib/repo-mirror-ci/sync/booboo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced booboo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/brave-overlay.html b/brave-overlay.html
index be4380116104..bf885d3d8bbb 100644
--- a/brave-overlay.html
+++ b/brave-overlay.html
@@ -32,93 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync brave-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync brave-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing brave-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:benzene-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/benzene-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:binaryden repo at &#x27;/var/lib/repo-mirror-ci/sync/binaryden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bitcetera repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcetera&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced brave-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brave-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing brave-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced brave-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brave-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/brave-overlay.txt b/brave-overlay.txt
index 70374d6c3e22..2f235d94d926 100644
--- a/brave-overlay.txt
+++ b/brave-overlay.txt
@@ -9,44 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync brave-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:benzene-overlay repo at '/var/lib/repo-mirror-ci/sync/benzene-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:binaryden repo at '/var/lib/repo-mirror-ci/sync/binaryden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcetera repo at '/var/lib/repo-mirror-ci/sync/bitcetera', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing brave-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/brave-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced brave-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bright.html b/bright.html
index 94770fa5d97a..834fc3713d36 100644
--- a/bright.html
+++ b/bright.html
@@ -30,337 +30,59 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bright
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync bright
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing bright
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced bright
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bright
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing bright
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced bright
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bright
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f1e96d18d30&gt;
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20119&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * app-text/highlight-3.42-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-text/highlight-3.42-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-misc/ddgr-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * net-misc/ddgr-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-misc/trackma-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * x11-misc/screenkey-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-misc/screenkey-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20119&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20119&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;20119&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20119&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l161"><td><a href="#l161"><span>161</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f1e9740af70&gt;
-</pre></td></tr>
- <tr class="" id="l162"><td><a href="#l162"><span>162</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l163"><td><a href="#l163"><span>163</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l164"><td><a href="#l164"><span>164</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l165"><td><a href="#l165"><span>165</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l166"><td><a href="#l166"><span>166</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l167"><td><a href="#l167"><span>167</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l168"><td><a href="#l168"><span>168</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l169"><td><a href="#l169"><span>169</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l170"><td><a href="#l170"><span>170</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l171"><td><a href="#l171"><span>171</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l172"><td><a href="#l172"><span>172</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l173"><td><a href="#l173"><span>173</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l174"><td><a href="#l174"><span>174</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l175"><td><a href="#l175"><span>175</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20119&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l176"><td><a href="#l176"><span>176</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/bright.txt b/bright.txt
index b7b2f623dfa0..91de92a83eff 100644
--- a/bright.txt
+++ b/bright.txt
@@ -8,169 +8,30 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/filalex77/bright.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bright
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bright
-Cloning into '/var/lib/repo-mirror-ci/sync/bright'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bright
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bright
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f1e96d18d30>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20119' appears dead, timing out
* app-text/highlight-3.42-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
* net-misc/ddgr-1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* net-misc/trackma-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* x11-misc/screenkey-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20119' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20119' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '20119' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20119' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f1e9740af70>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20119' appears dead, timing out
* Cache regen failed with 1
diff --git a/brother-overlay.html b/brother-overlay.html
index a7ac814c572e..16255c893d2a 100644
--- a/brother-overlay.html
+++ b/brother-overlay.html
@@ -40,89 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync brother-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync brother-overlay
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing brother-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced brother-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing brother-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced brother-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/brother-overlay.txt b/brother-overlay.txt
index 3265e8e4823e..654515f5317e 100644
--- a/brother-overlay.txt
+++ b/brother-overlay.txt
@@ -13,42 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:stefan-langenmaier/brother-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync brother-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing brother-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/brother-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced brother-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bubba.html b/bubba.html
index b37d9411cf93..0d94ebdb306d 100644
--- a/bubba.html
+++ b/bubba.html
@@ -30,89 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync bubba
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync bubba
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing bubba
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced bubba
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bubba
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing bubba
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced bubba
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bubba
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bubba.txt b/bubba.txt
index 3b5cf5908e0e..1004149683aa 100644
--- a/bubba.txt
+++ b/bubba.txt
@@ -8,42 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/gordonb3/bubba-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bubba
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bubba
-Cloning into '/var/lib/repo-mirror-ci/sync/bubba'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bubba
* Sync succeeded
$ git log --format=%ci -1
diff --git a/bumblebee.html b/bumblebee.html
index 2574ded1d743..5b03810eab5c 100644
--- a/bumblebee.html
+++ b/bumblebee.html
@@ -32,97 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync bumblebee
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync bumblebee
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing bumblebee
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced bumblebee
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bumblebee
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing bumblebee
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced bumblebee
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 bumblebee
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/bumblebee.txt b/bumblebee.txt
index ea2124ddb307..576b2112967c 100644
--- a/bumblebee.txt
+++ b/bumblebee.txt
@@ -9,46 +9,23 @@
'source': [{'type': 'git',
'uri': 'git://github.com/Bumblebee-Project/bumblebee-gentoo'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync bumblebee
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing bumblebee
-Cloning into '/var/lib/repo-mirror-ci/sync/bumblebee'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced bumblebee
* Sync succeeded
$ git log --format=%ci -1
diff --git a/buzden.html b/buzden.html
index 8fdc73b40195..2ee4a27d9ebc 100644
--- a/buzden.html
+++ b/buzden.html
@@ -38,89 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync buzden
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync buzden
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing buzden
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced buzden
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 buzden
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing buzden
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced buzden
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 buzden
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/buzden.txt b/buzden.txt
index a5e003d8f4c7..0558361861b6 100644
--- a/buzden.txt
+++ b/buzden.txt
@@ -12,42 +12,23 @@
'uri': 'git://github.com/buzden/buzden-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:buzden/buzden-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync buzden
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing buzden
-Cloning into '/var/lib/repo-mirror-ci/sync/buzden'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced buzden
* Sync succeeded
$ git log --format=%ci -1
diff --git a/calculate.html b/calculate.html
index 5c0da6234883..636fdbf3d139 100644
--- a/calculate.html
+++ b/calculate.html
@@ -26,91 +26,69 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync calculate
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync calculate
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing calculate
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>From git://git.calculate-linux.org/calculate/calculate-overlay
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> fca21131b..53348c76e master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> 53348c76e..a1f68beb0 develop -&gt; origin/develop
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> fca21131b..53348c76e master64 -&gt; origin/master64
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> 53348c76e..a1f68beb0 update -&gt; origin/update
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * [new tag] 2409 -&gt; 2409
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating fca21131b..53348c76e
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> profiles/calculate.env | 2 +-
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> 1 file changed, 1 insertion(+), 1 deletion(-)
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced calculate
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 calculate
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing calculate
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced calculate
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 calculate
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/calculate.txt b/calculate.txt
index 7041c1102f60..3803a5e5c134 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -6,43 +6,32 @@
'source': [{'type': 'git',
'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync calculate
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing calculate
-Cloning into '/var/lib/repo-mirror-ci/sync/calculate'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+From git://git.calculate-linux.org/calculate/calculate-overlay
+ fca21131b..53348c76e master -> origin/master
+ 53348c76e..a1f68beb0 develop -> origin/develop
+ fca21131b..53348c76e master64 -> origin/master64
+ 53348c76e..a1f68beb0 update -> origin/update
+ * [new tag] 2409 -> 2409
+Updating fca21131b..53348c76e
+Fast-forward
+ profiles/calculate.env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
*** synced calculate
* Sync succeeded
$ git log --format=%ci -1
diff --git a/canutethegreat-overlay.html b/canutethegreat-overlay.html
index ec480d7f620f..dd4409ce4c7d 100644
--- a/canutethegreat-overlay.html
+++ b/canutethegreat-overlay.html
@@ -38,95 +38,55 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync canutethegreat-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync canutethegreat-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing canutethegreat-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bibletime repo at &#x27;/var/lib/repo-mirror-ci/sync/bibletime&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bloody repo at &#x27;/var/lib/repo-mirror-ci/sync/bloody&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced canutethegreat-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 canutethegreat-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing canutethegreat-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced canutethegreat-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 canutethegreat-overlay
-</pre></td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-mobilephone/easytether-0.8.9: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-mobilephone/easytether-0.8.9: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-office/overgrive-3.3.9: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-office/overgrive-3.3.9: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/canutethegreat-overlay.txt b/canutethegreat-overlay.txt
index 9083a1048ec3..b317f96a5585 100644
--- a/canutethegreat-overlay.txt
+++ b/canutethegreat-overlay.txt
@@ -12,43 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync canutethegreat-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bibletime repo at '/var/lib/repo-mirror-ci/sync/bibletime', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bloody repo at '/var/lib/repo-mirror-ci/sync/bloody', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing canutethegreat-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced canutethegreat-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ceamac.html b/ceamac.html
index 5dd866cb8543..95e6274189a4 100644
--- a/ceamac.html
+++ b/ceamac.html
@@ -38,103 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ceamac
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ceamac
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ceamac
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ceamac
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ceamac
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing ceamac
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced ceamac
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ceamac
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ceamac.txt b/ceamac.txt
index 80eb5f1bbe0c..b51d399138f1 100644
--- a/ceamac.txt
+++ b/ceamac.txt
@@ -12,49 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/ceamac/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ceamac
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ceamac
-Cloning into '/var/lib/repo-mirror-ci/sync/ceamac'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ceamac
* Sync succeeded
$ git log --format=%ci -1
diff --git a/certbot-dns-plugins.html b/certbot-dns-plugins.html
index 986ddafaa21d..83cf7516d2da 100644
--- a/certbot-dns-plugins.html
+++ b/certbot-dns-plugins.html
@@ -38,103 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync certbot-dns-plugins
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync certbot-dns-plugins
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing certbot-dns-plugins
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced certbot-dns-plugins
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 certbot-dns-plugins
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing certbot-dns-plugins
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced certbot-dns-plugins
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 certbot-dns-plugins
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/certbot-dns-plugins.txt b/certbot-dns-plugins.txt
index adaae0428c4f..d10a729281b0 100644
--- a/certbot-dns-plugins.txt
+++ b/certbot-dns-plugins.txt
@@ -12,49 +12,23 @@
{'type': 'git',
'uri': 'git@github.com:osirisinferi/certbot-dns-plugins-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync certbot-dns-plugins
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing certbot-dns-plugins
-Cloning into '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced certbot-dns-plugins
* Sync succeeded
$ git log --format=%ci -1
diff --git a/cg.html b/cg.html
index 229fc7ab6f4c..b66def1129a6 100644
--- a/cg.html
+++ b/cg.html
@@ -26,113 +26,61 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync cg
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync cg
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing cg
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bombo82 repo at &#x27;/var/lib/repo-mirror-ci/sync/bombo82&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced cg
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cg
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing cg
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced cg
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cg
-</pre></td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-emacs/elpy-1.34.0: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * media-gfx/AwesomeBump-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-gfx/AwesomeBump-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * media-gfx/ShipCAD-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-gfx/ShipCAD-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * media-gfx/meshlab-9999-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-gfx/meshlab-9999-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * media-gfx/ngplant-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-gfx/ngplant-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/cg.txt b/cg.txt
index 347f64116418..2d6f709c9591 100644
--- a/cg.txt
+++ b/cg.txt
@@ -6,49 +6,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/brothermechanic/cg.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync cg
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bombo82 repo at '/var/lib/repo-mirror-ci/sync/bombo82', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing cg
-Cloning into '/var/lib/repo-mirror-ci/sync/cg'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced cg
* Sync succeeded
$ git log --format=%ci -1
diff --git a/chrisadr.html b/chrisadr.html
index 2483cdfc4d9f..248b256efce6 100644
--- a/chrisadr.html
+++ b/chrisadr.html
@@ -36,119 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync chrisadr
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync chrisadr
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing chrisadr
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced chrisadr
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chrisadr
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing chrisadr
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;...
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>*** synced chrisadr
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chrisadr
-</pre></td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * app-admin/installer-0.1.1_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-admin/installer-0.1.1_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/chrisadr.txt b/chrisadr.txt
index 20742555451e..3cf952a27874 100644
--- a/chrisadr.txt
+++ b/chrisadr.txt
@@ -11,56 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync chrisadr
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing chrisadr
-Cloning into '/var/lib/repo-mirror-ci/sync/chrisadr'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced chrisadr
* Sync succeeded
$ git log --format=%ci -1
diff --git a/chrytoo.html b/chrytoo.html
index f39e23179922..ddfb582801e2 100644
--- a/chrytoo.html
+++ b/chrytoo.html
@@ -42,113 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync chrytoo
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync chrytoo
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing chrytoo
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced chrytoo
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chrytoo
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>WARNING:pkgcore:chrisadr repo at &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** syncing chrytoo
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>*** synced chrytoo
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chrytoo
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/chrytoo.txt b/chrytoo.txt
index 7c676e88a123..8381300797e1 100644
--- a/chrytoo.txt
+++ b/chrytoo.txt
@@ -14,54 +14,23 @@
{'type': 'git',
'uri': 'git@github.com:chrytoo/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync chrytoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrisadr repo at '/var/lib/repo-mirror-ci/sync/chrisadr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing chrytoo
-Cloning into '/var/lib/repo-mirror-ci/sync/chrytoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced chrytoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/chymeric.html b/chymeric.html
index 25e41e66b60f..703f92d34e52 100644
--- a/chymeric.html
+++ b/chymeric.html
@@ -36,119 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync chymeric
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync chymeric
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing chymeric
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:blender-gentoo-logo repo at &#x27;/var/lib/repo-mirror-ci/sync/blender-gentoo-logo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:brave-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brave-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced chymeric
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chymeric
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>WARNING:pkgcore:chrisadr repo at &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** syncing chymeric
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;...
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>*** synced chymeric
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 chymeric
-</pre></td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * sci-libs/cosgen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * sci-libs/cosgen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/chymeric.txt b/chymeric.txt
index e31d219d4bd8..9b78de2a7606 100644
--- a/chymeric.txt
+++ b/chymeric.txt
@@ -11,56 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/TheChymera/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync chymeric
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrisadr repo at '/var/lib/repo-mirror-ci/sync/chrisadr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing chymeric
-Cloning into '/var/lib/repo-mirror-ci/sync/chymeric'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced chymeric
* Sync succeeded
$ git log --format=%ci -1
diff --git a/cj-overlay.html b/cj-overlay.html
index b90dac824103..320ff1012636 100644
--- a/cj-overlay.html
+++ b/cj-overlay.html
@@ -26,107 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync cj-overlay
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync cj-overlay
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing cj-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced cj-overlay
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cj-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:chrisadr repo at &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:chrytoo repo at &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing cj-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced cj-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cj-overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/cj-overlay.txt b/cj-overlay.txt
index c993872b8625..ee3d8d98c971 100644
--- a/cj-overlay.txt
+++ b/cj-overlay.txt
@@ -6,51 +6,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/junghans/cj-overlay'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync cj-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrisadr repo at '/var/lib/repo-mirror-ci/sync/chrisadr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrytoo repo at '/var/lib/repo-mirror-ci/sync/chrytoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing cj-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/cj-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced cj-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/concaveoverlay.html b/concaveoverlay.html
index 36718490eddd..1e4db32717f6 100644
--- a/concaveoverlay.html
+++ b/concaveoverlay.html
@@ -28,257 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync concaveoverlay
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync concaveoverlay
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing concaveoverlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:booboo repo at &#x27;/var/lib/repo-mirror-ci/sync/booboo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bright repo at &#x27;/var/lib/repo-mirror-ci/sync/bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced concaveoverlay
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:buzden repo at &#x27;/var/lib/repo-mirror-ci/sync/buzden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:canutethegreat-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/canutethegreat-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 concaveoverlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:certbot-dns-plugins repo at &#x27;/var/lib/repo-mirror-ci/sync/certbot-dns-plugins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:bitcoin repo at &#x27;/var/lib/repo-mirror-ci/sync/bitcoin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:brother-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/brother-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:bumblebee repo at &#x27;/var/lib/repo-mirror-ci/sync/bumblebee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:chrisadr repo at &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:chrytoo repo at &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing concaveoverlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced concaveoverlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 concaveoverlay
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f90a3598d30&gt;
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;15212&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;15212&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;15212&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;15212&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f90a3c8af70&gt;
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;15212&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/concaveoverlay.txt b/concaveoverlay.txt
index 0f7c7aeafe38..d196a6432170 100644
--- a/concaveoverlay.txt
+++ b/concaveoverlay.txt
@@ -7,129 +7,26 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/concavegit/concaveoverlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync concaveoverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:booboo repo at '/var/lib/repo-mirror-ci/sync/booboo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bright repo at '/var/lib/repo-mirror-ci/sync/bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:buzden repo at '/var/lib/repo-mirror-ci/sync/buzden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:canutethegreat-overlay repo at '/var/lib/repo-mirror-ci/sync/canutethegreat-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:certbot-dns-plugins repo at '/var/lib/repo-mirror-ci/sync/certbot-dns-plugins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:brother-overlay repo at '/var/lib/repo-mirror-ci/sync/brother-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bumblebee repo at '/var/lib/repo-mirror-ci/sync/bumblebee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrisadr repo at '/var/lib/repo-mirror-ci/sync/chrisadr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrytoo repo at '/var/lib/repo-mirror-ci/sync/chrytoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing concaveoverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/concaveoverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced concaveoverlay
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 concaveoverlay
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f90a3598d30>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '15212' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '15212' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '15212' appears dead, timing out
-ERROR pkgcore: ebp for pid '15212' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f90a3c8af70>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '15212' appears dead, timing out
* Cache regenerated successfully
diff --git a/cosmicmod.html b/cosmicmod.html
index 0aae6f27d115..fe62268b5ab7 100644
--- a/cosmicmod.html
+++ b/cosmicmod.html
@@ -26,233 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync cosmicmod
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync cosmicmod
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing cosmicmod
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:argent-main repo at &#x27;/var/lib/repo-mirror-ci/sync/argent-main&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:awesome repo at &#x27;/var/lib/repo-mirror-ci/sync/awesome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:beatussum-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/beatussum-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bleeding-edge repo at &#x27;/var/lib/repo-mirror-ci/sync/bleeding-edge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ceamac repo at &#x27;/var/lib/repo-mirror-ci/sync/ceamac&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:chrisadr repo at &#x27;/var/lib/repo-mirror-ci/sync/chrisadr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced cosmicmod
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:chrytoo repo at &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cosmicmod
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:chrytoo repo at &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing cosmicmod
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced cosmicmod
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cosmicmod
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f88788d0d30&gt;
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;26853&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;26853&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;26853&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;26853&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f8878fc2f70&gt;
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;26853&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/cosmicmod.txt b/cosmicmod.txt
index 223ff9fd8529..cf16c35fe744 100644
--- a/cosmicmod.txt
+++ b/cosmicmod.txt
@@ -6,117 +6,26 @@
'source': [{'type': 'git',
'uri': 'https://github.com/cosmicoz/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync cosmicmod
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:awesome repo at '/var/lib/repo-mirror-ci/sync/awesome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:beatussum-overlay repo at '/var/lib/repo-mirror-ci/sync/beatussum-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bleeding-edge repo at '/var/lib/repo-mirror-ci/sync/bleeding-edge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ceamac repo at '/var/lib/repo-mirror-ci/sync/ceamac', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrisadr repo at '/var/lib/repo-mirror-ci/sync/chrisadr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrytoo repo at '/var/lib/repo-mirror-ci/sync/chrytoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrytoo repo at '/var/lib/repo-mirror-ci/sync/chrytoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing cosmicmod
-Cloning into '/var/lib/repo-mirror-ci/sync/cosmicmod'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced cosmicmod
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 cosmicmod
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f88788d0d30>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '26853' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '26853' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '26853' appears dead, timing out
-ERROR pkgcore: ebp for pid '26853' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f8878fc2f70>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '26853' appears dead, timing out
* Cache regenerated successfully
diff --git a/crocket-overlay.html b/crocket-overlay.html
index d45104d33492..1b9e8589dc19 100644
--- a/crocket-overlay.html
+++ b/crocket-overlay.html
@@ -36,77 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync crocket-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync crocket-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing crocket-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:chrytoo repo at &#x27;/var/lib/repo-mirror-ci/sync/chrytoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced crocket-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 crocket-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing crocket-overlay
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced crocket-overlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 crocket-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/crocket-overlay.txt b/crocket-overlay.txt
index 190cdeeb7c65..5132054ee515 100644
--- a/crocket-overlay.txt
+++ b/crocket-overlay.txt
@@ -11,36 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/crocket/crocket-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync crocket-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chrytoo repo at '/var/lib/repo-mirror-ci/sync/chrytoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing crocket-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/crocket-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced crocket-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/crossdev.html b/crossdev.html
index acdc639491ea..c3603f1ca1d9 100644
--- a/crossdev.html
+++ b/crossdev.html
@@ -32,75 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync crossdev
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync crossdev
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing crossdev
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bubba repo at &#x27;/var/lib/repo-mirror-ci/sync/bubba&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:cg repo at &#x27;/var/lib/repo-mirror-ci/sync/cg&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:chymeric repo at &#x27;/var/lib/repo-mirror-ci/sync/chymeric&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced crossdev
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 crossdev
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing crossdev
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;...
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced crossdev
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 crossdev
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/crossdev.txt b/crossdev.txt
index 6103472aed8d..4811fa3a451c 100644
--- a/crossdev.txt
+++ b/crossdev.txt
@@ -9,35 +9,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/alphallc/crossdev'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync crossdev
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bubba repo at '/var/lib/repo-mirror-ci/sync/bubba', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cg repo at '/var/lib/repo-mirror-ci/sync/cg', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:chymeric repo at '/var/lib/repo-mirror-ci/sync/chymeric', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing crossdev
-Cloning into '/var/lib/repo-mirror-ci/sync/crossdev'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced crossdev
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dMaggot.html b/dMaggot.html
index 5a3d7b205554..08289ab0d08b 100644
--- a/dMaggot.html
+++ b/dMaggot.html
@@ -38,71 +38,55 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync dMaggot
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync dMaggot
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing dMaggot
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced dMaggot
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dMaggot
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing dMaggot
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;...
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced dMaggot
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dMaggot
-</pre></td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-util/gcc-python-plugin-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-util/gcc-python-plugin-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-util/gcc-python-plugin-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-util/gcc-python-plugin-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/dMaggot.txt b/dMaggot.txt
index 05f4114692c0..00fceadcbea2 100644
--- a/dMaggot.txt
+++ b/dMaggot.txt
@@ -12,31 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/dMaggot.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dMaggot
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dMaggot
-Cloning into '/var/lib/repo-mirror-ci/sync/dMaggot'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dMaggot
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dargor.html b/dargor.html
index 0750e0ca2d57..8dd85e05299b 100644
--- a/dargor.html
+++ b/dargor.html
@@ -36,67 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync dargor
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync dargor
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing dargor
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced dargor
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dargor
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing dargor
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;...
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced dargor
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dargor
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dargor.txt b/dargor.txt
index d876523e0cc8..869a59dbf74a 100644
--- a/dargor.txt
+++ b/dargor.txt
@@ -11,31 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:dargor/dargor_gentoo_overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dargor
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dargor
-Cloning into '/var/lib/repo-mirror-ci/sync/dargor'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dargor
* Sync succeeded
$ git log --format=%ci -1
diff --git a/darkelf.html b/darkelf.html
index d0625a18c96b..89de0af28292 100644
--- a/darkelf.html
+++ b/darkelf.html
@@ -34,67 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync darkelf
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync darkelf
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing darkelf
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced darkelf
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 darkelf
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing darkelf
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;...
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced darkelf
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 darkelf
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/darkelf.txt b/darkelf.txt
index 4fdd9473d97b..02c5f71dbc1e 100644
--- a/darkelf.txt
+++ b/darkelf.txt
@@ -10,31 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/darkelf.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync darkelf
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing darkelf
-Cloning into '/var/lib/repo-mirror-ci/sync/darkelf'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced darkelf
* Sync succeeded
$ git log --format=%ci -1
diff --git a/darthgandalf-overlay.html b/darthgandalf-overlay.html
index 2fe4d0ea85f2..04db8a0c91db 100644
--- a/darthgandalf-overlay.html
+++ b/darthgandalf-overlay.html
@@ -36,67 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync darthgandalf-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync darthgandalf-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing darthgandalf-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced darthgandalf-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 darthgandalf-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing darthgandalf-overlay
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced darthgandalf-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 darthgandalf-overlay
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/darthgandalf-overlay.txt b/darthgandalf-overlay.txt
index 0233d0ff139d..dc134cd346a4 100644
--- a/darthgandalf-overlay.txt
+++ b/darthgandalf-overlay.txt
@@ -11,31 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync darthgandalf-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing darthgandalf-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced darthgandalf-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/decent-im.html b/decent-im.html
index c793b5aa90a7..c6ab8aac94b3 100644
--- a/decent-im.html
+++ b/decent-im.html
@@ -36,73 +36,57 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync decent-im
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync decent-im
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing decent-im
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced decent-im
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 decent-im
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing decent-im
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;...
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced decent-im
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 decent-im
-</pre></td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/cx_Freeze-5.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/cx_Freeze-5.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/python-nbxmpp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/python-nbxmpp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * net-im/gajim-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-im/gajim-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/decent-im.txt b/decent-im.txt
index ecd0ac02f6b0..88c0173172ea 100644
--- a/decent-im.txt
+++ b/decent-im.txt
@@ -11,31 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/decent-im/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync decent-im
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing decent-im
-Cloning into '/var/lib/repo-mirror-ci/sync/decent-im'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced decent-im
* Sync succeeded
$ git log --format=%ci -1
diff --git a/deepin.html b/deepin.html
index 7967d38ca251..3c93cf251493 100644
--- a/deepin.html
+++ b/deepin.html
@@ -32,87 +32,63 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync deepin
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync deepin
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing deepin
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bircoph repo at &#x27;/var/lib/repo-mirror-ci/sync/bircoph&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:cj-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/cj-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:concaveoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/concaveoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:cosmicmod repo at &#x27;/var/lib/repo-mirror-ci/sync/cosmicmod&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced deepin
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 deepin
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing deepin
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;...
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced deepin
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 deepin
-</pre></td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-emulation/deepin-wine-plugin-1.0.2: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-emulation/deepin-wine-plugin-1.0.2: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * mail-client/deepin-wine-foxmail-7.2.3: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * mail-client/deepin-wine-foxmail-7.2.3: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * net-im/deepin-wine-QQ-Light-7.9.14308.8: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-im/deepin-wine-QQ-Light-7.9.14308.8: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-im/deepin-wine-TIM-2.0.0.4: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-im/deepin-wine-TIM-2.0.0.4: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-im/deepin-wine-wechat-work-2.8.10.2010.0: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-im/deepin-wine-wechat-work-2.8.10.2010.0: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/deepin-wine-thunderspeed-7.10.35.366.18: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-misc/deepin-wine-thunderspeed-7.10.35.366.18: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/deepin.txt b/deepin.txt
index 974539290d62..630d8543b514 100644
--- a/deepin.txt
+++ b/deepin.txt
@@ -9,35 +9,23 @@
'source': [{'type': 'git',
'uri': 'git://github.com/zhtengw/deepin-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync deepin
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bircoph repo at '/var/lib/repo-mirror-ci/sync/bircoph', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cj-overlay repo at '/var/lib/repo-mirror-ci/sync/cj-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:cosmicmod repo at '/var/lib/repo-mirror-ci/sync/cosmicmod', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing deepin
-Cloning into '/var/lib/repo-mirror-ci/sync/deepin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced deepin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/defiance.html b/defiance.html
index d9eef91d53ad..c5ec35862518 100644
--- a/defiance.html
+++ b/defiance.html
@@ -34,73 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync defiance
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync defiance
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing defiance
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced defiance
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 defiance
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing defiance
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;...
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced defiance
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 defiance
-</pre></td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-db/timescaledb-2.0.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-db/timescaledb-2.0.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/defiance.txt b/defiance.txt
index 9a27a45fc900..d8d1c9a46f3a 100644
--- a/defiance.txt
+++ b/defiance.txt
@@ -10,33 +10,23 @@
'uri': 'git://github.com/d3fy/defiance-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:d3fy/defiance-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync defiance
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing defiance
-Cloning into '/var/lib/repo-mirror-ci/sync/defiance'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced defiance
* Sync succeeded
$ git log --format=%ci -1
diff --git a/delicious-absurdities.html b/delicious-absurdities.html
index 8bf6616cb17a..9f3e3fc8b0e9 100644
--- a/delicious-absurdities.html
+++ b/delicious-absurdities.html
@@ -40,79 +40,57 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync delicious-absurdities
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync delicious-absurdities
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing delicious-absurdities
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced delicious-absurdities
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 delicious-absurdities
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing delicious-absurdities
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced delicious-absurdities
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 delicious-absurdities
-</pre></td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-sound/openob-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-sound/openob-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-sound/welle-io-1.0_pre20170520: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-sound/welle-io-1.0_pre20170520: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-sound/welle-io-1.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-sound/welle-io-1.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/delicious-absurdities.txt b/delicious-absurdities.txt
index 56318c813cf8..6ae653d7da56 100644
--- a/delicious-absurdities.txt
+++ b/delicious-absurdities.txt
@@ -13,34 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:paraenggu/delicious-absurdities-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync delicious-absurdities
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing delicious-absurdities
-Cloning into '/var/lib/repo-mirror-ci/sync/delicious-absurdities'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced delicious-absurdities
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dequbed.html b/dequbed.html
index 0f85f5eccb27..088d9fd1e6ca 100644
--- a/dequbed.html
+++ b/dequbed.html
@@ -32,73 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dequbed
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dequbed
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dequbed
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dequbed
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dequbed
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** syncing dequbed
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;...
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced dequbed
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dequbed
-</pre></td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * x11-misc/compton-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * x11-misc/compton-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/dequbed.txt b/dequbed.txt
index cd468d3181b2..91349cc5bb58 100644
--- a/dequbed.txt
+++ b/dequbed.txt
@@ -9,33 +9,23 @@
{'type': 'git', 'uri': 'git://github.com/dequbed/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:dequbed/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dequbed
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dequbed
-Cloning into '/var/lib/repo-mirror-ci/sync/dequbed'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dequbed
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dev1990-overlay.html b/dev1990-overlay.html
index 0f50c8094959..c3e84b65669a 100644
--- a/dev1990-overlay.html
+++ b/dev1990-overlay.html
@@ -32,75 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dev1990-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dev1990-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dev1990-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dev1990-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dev1990-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing dev1990-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced dev1990-overlay
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dev1990-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dev1990-overlay.txt b/dev1990-overlay.txt
index e084c1c8a86b..03a1ab6cdc16 100644
--- a/dev1990-overlay.txt
+++ b/dev1990-overlay.txt
@@ -9,35 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/dev-0x7C6/dev1990-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dev1990-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dev1990-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/dev1990-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dev1990-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dilfridge.html b/dilfridge.html
index 29f8548a8ce2..d074bec36bbc 100644
--- a/dilfridge.html
+++ b/dilfridge.html
@@ -42,75 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dilfridge
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync dilfridge
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing dilfridge
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced dilfridge
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dilfridge
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing dilfridge
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced dilfridge
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dilfridge
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dilfridge.txt b/dilfridge.txt
index 4f06511e1164..cb96ba77a7ca 100644
--- a/dilfridge.txt
+++ b/dilfridge.txt
@@ -14,35 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/dilfridge.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync dilfridge
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dilfridge
-Cloning into '/var/lib/repo-mirror-ci/sync/dilfridge'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dilfridge
* Sync succeeded
$ git log --format=%ci -1
diff --git a/displacer.html b/displacer.html
index e3650aeddc5f..728cba68cc53 100644
--- a/displacer.html
+++ b/displacer.html
@@ -40,75 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync displacer
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync displacer
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing displacer
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced displacer
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 displacer
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing displacer
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced displacer
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 displacer
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/displacer.txt b/displacer.txt
index e6683cec6da2..4c88f974f851 100644
--- a/displacer.txt
+++ b/displacer.txt
@@ -13,35 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/displacer.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync displacer
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing displacer
-Cloning into '/var/lib/repo-mirror-ci/sync/displacer'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced displacer
* Sync succeeded
$ git log --format=%ci -1
diff --git a/distros.html b/distros.html
index ab21ce757970..ee340cb7a6c0 100644
--- a/distros.html
+++ b/distros.html
@@ -26,75 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync distros
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync distros
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing distros
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:crocket-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/crocket-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced distros
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 distros
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing distros
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;...
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced distros
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 distros
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/distros.txt b/distros.txt
index b05fa42362ff..a495d854a6e3 100644
--- a/distros.txt
+++ b/distros.txt
@@ -6,35 +6,23 @@
'source': [{'type': 'git',
'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync distros
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crocket-overlay repo at '/var/lib/repo-mirror-ci/sync/crocket-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing distros
-Cloning into '/var/lib/repo-mirror-ci/sync/distros'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced distros
* Sync succeeded
$ git log --format=%ci -1
diff --git a/djc.html b/djc.html
index 21c570ad8ba4..e386bdcd4b9b 100644
--- a/djc.html
+++ b/djc.html
@@ -34,89 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync djc
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync djc
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing djc
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced djc
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 djc
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing djc
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced djc
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 djc
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/djc.txt b/djc.txt
index 33dae3ac7968..e8561b0cd554 100644
--- a/djc.txt
+++ b/djc.txt
@@ -10,42 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/djc/djc-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:djc/djc-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync djc
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing djc
-Cloning into '/var/lib/repo-mirror-ci/sync/djc'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced djc
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dlang.html b/dlang.html
index b6c3d5bae09e..e5d070bddc38 100644
--- a/dlang.html
+++ b/dlang.html
@@ -32,91 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dlang
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dlang
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dlang
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dlang
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing dlang
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced dlang
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dlang
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dlang.txt b/dlang.txt
index caa04445c885..4ec0d6e56ecb 100644
--- a/dlang.txt
+++ b/dlang.txt
@@ -9,43 +9,23 @@
{'type': 'git', 'uri': 'git@github.com:gentoo/dlang.git'},
{'type': 'git', 'uri': 'git://github.com/gentoo/dlang.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dlang
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dlang
-Cloning into '/var/lib/repo-mirror-ci/sync/dlang'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dlang
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dm9pZCAq.html b/dm9pZCAq.html
index 91811906172a..4e094cfaa8ea 100644
--- a/dm9pZCAq.html
+++ b/dm9pZCAq.html
@@ -28,93 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync dm9pZCAq
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync dm9pZCAq
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing dm9pZCAq
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced dm9pZCAq
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dm9pZCAq
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing dm9pZCAq
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced dm9pZCAq
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dm9pZCAq
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt
index 4ba9818eb559..0a452fdf9bcf 100644
--- a/dm9pZCAq.txt
+++ b/dm9pZCAq.txt
@@ -7,44 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dm9pZCAq
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dm9pZCAq
-Cloning into '/var/lib/repo-mirror-ci/sync/dm9pZCAq'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dm9pZCAq
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dmchurch.html b/dmchurch.html
index db788040dbef..99db216be37c 100644
--- a/dmchurch.html
+++ b/dmchurch.html
@@ -40,91 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync dmchurch
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync dmchurch
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing dmchurch
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced dmchurch
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dmchurch
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing dmchurch
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced dmchurch
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dmchurch
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dmchurch.txt b/dmchurch.txt
index 7fd5a175aeea..cffe20d0ae7d 100644
--- a/dmchurch.txt
+++ b/dmchurch.txt
@@ -13,43 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:dmchurch/portage-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dmchurch
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dmchurch
-Cloning into '/var/lib/repo-mirror-ci/sync/dmchurch'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dmchurch
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dotnet.html b/dotnet.html
index 0bea0e755fc5..10f8133804fc 100644
--- a/dotnet.html
+++ b/dotnet.html
@@ -32,91 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dotnet
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dotnet
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dotnet
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:alxu repo at &#x27;/var/lib/repo-mirror-ci/sync/alxu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:crossdev repo at &#x27;/var/lib/repo-mirror-ci/sync/crossdev&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dargor repo at &#x27;/var/lib/repo-mirror-ci/sync/dargor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:darthgandalf-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/darthgandalf-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dotnet
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dotnet
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing dotnet
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced dotnet
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dotnet
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dotnet.txt b/dotnet.txt
index de9a8548e7bd..d542fa22c696 100644
--- a/dotnet.txt
+++ b/dotnet.txt
@@ -9,43 +9,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/gentoo/dotnet.git'},
{'type': 'git', 'uri': 'git@github.com:gentoo/dotnet.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync dotnet
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:alxu repo at '/var/lib/repo-mirror-ci/sync/alxu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:crossdev repo at '/var/lib/repo-mirror-ci/sync/crossdev', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dargor repo at '/var/lib/repo-mirror-ci/sync/dargor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darthgandalf-overlay repo at '/var/lib/repo-mirror-ci/sync/darthgandalf-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dotnet
-Cloning into '/var/lib/repo-mirror-ci/sync/dotnet'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dotnet
* Sync succeeded
$ git log --format=%ci -1
diff --git a/drdim.html b/drdim.html
index 7212c4812b11..e0f1024f3b20 100644
--- a/drdim.html
+++ b/drdim.html
@@ -36,93 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync drdim
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync drdim
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing drdim
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced drdim
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing drdim
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced drdim
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 drdim
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/drdim.txt b/drdim.txt
index 4056a5d61441..9256746e573d 100644
--- a/drdim.txt
+++ b/drdim.txt
@@ -11,44 +11,23 @@
{'type': 'git', 'uri': 'git://github.com/drdim/layman.git'},
{'type': 'git', 'uri': 'git@github.com:drdim/layman.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync drdim
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing drdim
-Cloning into '/var/lib/repo-mirror-ci/sync/drdim'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced drdim
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dwfreed.html b/dwfreed.html
index f98e1cc39973..03527ea21b75 100644
--- a/dwfreed.html
+++ b/dwfreed.html
@@ -32,97 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync dwfreed
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync dwfreed
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing dwfreed
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced dwfreed
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwfreed
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing dwfreed
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced dwfreed
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwfreed
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dwfreed.txt b/dwfreed.txt
index a587f49eba54..eaf6dde15087 100644
--- a/dwfreed.txt
+++ b/dwfreed.txt
@@ -9,46 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://bitbucket.org/dwfreed/dwfreed.gentoo'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dwfreed
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dwfreed
-Cloning into '/var/lib/repo-mirror-ci/sync/dwfreed'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dwfreed
* Sync succeeded
$ git log --format=%ci -1
diff --git a/dwosky.html b/dwosky.html
index 61a981042638..a08bbe1255b5 100644
--- a/dwosky.html
+++ b/dwosky.html
@@ -36,97 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync dwosky
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync dwosky
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing dwosky
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced dwosky
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwosky
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing dwosky
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced dwosky
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dwosky
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/dwosky.txt b/dwosky.txt
index 93ed792f7653..60249b76918a 100644
--- a/dwosky.txt
+++ b/dwosky.txt
@@ -11,46 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Dwosky/Dwosky-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dwosky
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dwosky
-Cloning into '/var/lib/repo-mirror-ci/sync/dwosky'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced dwosky
* Sync succeeded
$ git log --format=%ci -1
diff --git a/earshark.html b/earshark.html
index b2cd1563dbb5..f7d5258c4dbc 100644
--- a/earshark.html
+++ b/earshark.html
@@ -32,99 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync earshark
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync earshark
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing earshark
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:decent-im repo at &#x27;/var/lib/repo-mirror-ci/sync/decent-im&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:delicious-absurdities repo at &#x27;/var/lib/repo-mirror-ci/sync/delicious-absurdities&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dequbed repo at &#x27;/var/lib/repo-mirror-ci/sync/dequbed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced earshark
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 earshark
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing earshark
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced earshark
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 earshark
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/earshark.txt b/earshark.txt
index 55898b71fda5..219487d29925 100644
--- a/earshark.txt
+++ b/earshark.txt
@@ -9,47 +9,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/Chemrat/overlay.git'},
{'type': 'git', 'uri': 'git://github.com/Chemrat/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync earshark
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:decent-im repo at '/var/lib/repo-mirror-ci/sync/decent-im', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:delicious-absurdities repo at '/var/lib/repo-mirror-ci/sync/delicious-absurdities', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dequbed repo at '/var/lib/repo-mirror-ci/sync/dequbed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing earshark
-Cloning into '/var/lib/repo-mirror-ci/sync/earshark'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced earshark
* Sync succeeded
$ git log --format=%ci -1
diff --git a/eclipse.html b/eclipse.html
index 44290d4762d4..04a2aaaa79f0 100644
--- a/eclipse.html
+++ b/eclipse.html
@@ -40,107 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync eclipse
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync eclipse
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing eclipse
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dev1990-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/dev1990-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced eclipse
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eclipse
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing eclipse
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;...
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** synced eclipse
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eclipse
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/eclipse.txt b/eclipse.txt
index 9e50598506c6..49edb68d3b65 100644
--- a/eclipse.txt
+++ b/eclipse.txt
@@ -13,51 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:gentoo/eclipse-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync eclipse
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dev1990-overlay repo at '/var/lib/repo-mirror-ci/sync/dev1990-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing eclipse
-Cloning into '/var/lib/repo-mirror-ci/sync/eclipse'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced eclipse
* Sync succeeded
$ git log --format=%ci -1
diff --git a/edgets.html b/edgets.html
index 0665aee348cb..4d1e750ba4d3 100644
--- a/edgets.html
+++ b/edgets.html
@@ -36,107 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync edgets
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync edgets
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing edgets
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:defiance repo at &#x27;/var/lib/repo-mirror-ci/sync/defiance&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:djc repo at &#x27;/var/lib/repo-mirror-ci/sync/djc&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced edgets
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dmchurch repo at &#x27;/var/lib/repo-mirror-ci/sync/dmchurch&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 edgets
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing edgets
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced edgets
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 edgets
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/edgets.txt b/edgets.txt
index 2d160c045a64..9a746744269a 100644
--- a/edgets.txt
+++ b/edgets.txt
@@ -11,51 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/BlueManCZ/edgets.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync edgets
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:defiance repo at '/var/lib/repo-mirror-ci/sync/defiance', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:djc repo at '/var/lib/repo-mirror-ci/sync/djc', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dmchurch repo at '/var/lib/repo-mirror-ci/sync/dmchurch', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing edgets
-Cloning into '/var/lib/repo-mirror-ci/sync/edgets'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced edgets
* Sync succeeded
$ git log --format=%ci -1
diff --git a/eigenlay.html b/eigenlay.html
index 3b3fa9313b27..ae7c1141aebf 100644
--- a/eigenlay.html
+++ b/eigenlay.html
@@ -28,99 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync eigenlay
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync eigenlay
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing eigenlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:deepin repo at &#x27;/var/lib/repo-mirror-ci/sync/deepin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced eigenlay
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eigenlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing eigenlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced eigenlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eigenlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/eigenlay.txt b/eigenlay.txt
index 9b2da4c2899f..24e8660d7c47 100644
--- a/eigenlay.txt
+++ b/eigenlay.txt
@@ -7,47 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://gitlab.com/eigennet/eigenlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync eigenlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:deepin repo at '/var/lib/repo-mirror-ci/sync/deepin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing eigenlay
-Cloning into '/var/lib/repo-mirror-ci/sync/eigenlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced eigenlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/einflay.html b/einflay.html
index 875f5c4102bb..10b8a6ef033d 100644
--- a/einflay.html
+++ b/einflay.html
@@ -36,91 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync einflay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync einflay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing einflay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced einflay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 einflay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing einflay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced einflay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 einflay
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-fonts/emojione-color-font-1.3: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-fonts/emojione-color-font-1.3: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/einflay.txt b/einflay.txt
index de47e11e1ea7..7bc28d184c9f 100644
--- a/einflay.txt
+++ b/einflay.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/EinstokFair/einflay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync einflay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing einflay
-Cloning into '/var/lib/repo-mirror-ci/sync/einflay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced einflay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ejabberd.html b/ejabberd.html
index 08bf96e98ce4..834c8e0f4849 100644
--- a/ejabberd.html
+++ b/ejabberd.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ejabberd
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ejabberd
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ejabberd
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ejabberd
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ejabberd
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing ejabberd
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced ejabberd
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ejabberd
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ejabberd.txt b/ejabberd.txt
index 3fb3d5b90690..ba18a38b875b 100644
--- a/ejabberd.txt
+++ b/ejabberd.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ejabberd
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ejabberd
-Cloning into '/var/lib/repo-mirror-ci/sync/ejabberd'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ejabberd
* Sync succeeded
$ git log --format=%ci -1
diff --git a/electron.html b/electron.html
index 2604c7568eb5..081ba23e6da6 100644
--- a/electron.html
+++ b/electron.html
@@ -32,89 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync electron
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync electron
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing electron
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced electron
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 electron
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing electron
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced electron
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 electron
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/electron.txt b/electron.txt
index dce2153d8798..3310031205b2 100644
--- a/electron.txt
+++ b/electron.txt
@@ -9,42 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/elprans/electron-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync electron
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing electron
-Cloning into '/var/lib/repo-mirror-ci/sync/electron'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced electron
* Sync succeeded
$ git log --format=%ci -1
diff --git a/elementary.html b/elementary.html
index fe6ca118022e..cb955d653d53 100644
--- a/elementary.html
+++ b/elementary.html
@@ -36,91 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync elementary
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync elementary
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing elementary
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:bobwya repo at &#x27;/var/lib/repo-mirror-ci/sync/bobwya&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dMaggot repo at &#x27;/var/lib/repo-mirror-ci/sync/dMaggot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:darkelf repo at &#x27;/var/lib/repo-mirror-ci/sync/darkelf&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:dlang repo at &#x27;/var/lib/repo-mirror-ci/sync/dlang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dotnet repo at &#x27;/var/lib/repo-mirror-ci/sync/dotnet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:drdim repo at &#x27;/var/lib/repo-mirror-ci/sync/drdim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced elementary
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dwosky repo at &#x27;/var/lib/repo-mirror-ci/sync/dwosky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:earshark repo at &#x27;/var/lib/repo-mirror-ci/sync/earshark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 elementary
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing elementary
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced elementary
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 elementary
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * x11-libs/bamf-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-libs/bamf-0.5.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/elementary.txt b/elementary.txt
index 61960e083cc2..b727b6ca2a57 100644
--- a/elementary.txt
+++ b/elementary.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/pimvullers/elementary.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync elementary
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:bobwya repo at '/var/lib/repo-mirror-ci/sync/bobwya', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dMaggot repo at '/var/lib/repo-mirror-ci/sync/dMaggot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dlang repo at '/var/lib/repo-mirror-ci/sync/dlang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dotnet repo at '/var/lib/repo-mirror-ci/sync/dotnet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:drdim repo at '/var/lib/repo-mirror-ci/sync/drdim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwosky repo at '/var/lib/repo-mirror-ci/sync/dwosky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:earshark repo at '/var/lib/repo-mirror-ci/sync/earshark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing elementary
-Cloning into '/var/lib/repo-mirror-ci/sync/elementary'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced elementary
* Sync succeeded
$ git log --format=%ci -1
diff --git a/elopez-r-overlay.html b/elopez-r-overlay.html
index 48b5899467b0..44a9b02a4b17 100644
--- a/elopez-r-overlay.html
+++ b/elopez-r-overlay.html
@@ -36,81 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync elopez-r-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync elopez-r-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing elopez-r-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced elopez-r-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 elopez-r-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing elopez-r-overlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced elopez-r-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 elopez-r-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/elopez-r-overlay.txt b/elopez-r-overlay.txt
index 8b9ece31ff36..b2b6e6a2925e 100644
--- a/elopez-r-overlay.txt
+++ b/elopez-r-overlay.txt
@@ -11,38 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync elopez-r-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing elopez-r-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/elopez-r-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced elopez-r-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/emacs.html b/emacs.html
index 379f0d299636..89b1d3987747 100644
--- a/emacs.html
+++ b/emacs.html
@@ -46,83 +46,51 @@
</pre></td></tr>
<tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync emacs
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint sync emacs
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing emacs
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:edgets repo at &#x27;/var/lib/repo-mirror-ci/sync/edgets&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced emacs
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:displacer repo at &#x27;/var/lib/repo-mirror-ci/sync/displacer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 emacs
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing emacs
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced emacs
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 emacs
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/emacs.txt b/emacs.txt
index 906192dca6be..e22cbd5cfbaa 100644
--- a/emacs.txt
+++ b/emacs.txt
@@ -16,39 +16,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/emacs.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync emacs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:edgets repo at '/var/lib/repo-mirror-ci/sync/edgets', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing emacs
-Cloning into '/var/lib/repo-mirror-ci/sync/emacs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced emacs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/enlightenment-live.html b/enlightenment-live.html
index b453ddf40e9c..471cc3a88e5c 100644
--- a/enlightenment-live.html
+++ b/enlightenment-live.html
@@ -34,85 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync enlightenment-live
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync enlightenment-live
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing enlightenment-live
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced enlightenment-live
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 enlightenment-live
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing enlightenment-live
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced enlightenment-live
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 enlightenment-live
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/enlightenment-live.txt b/enlightenment-live.txt
index 6e4bd6bae794..56ed39329710 100644
--- a/enlightenment-live.txt
+++ b/enlightenment-live.txt
@@ -10,40 +10,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/rafspiny/enlightenment-live.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync enlightenment-live
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing enlightenment-live
-Cloning into '/var/lib/repo-mirror-ci/sync/enlightenment-live'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced enlightenment-live
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ennui.html b/ennui.html
index 2bbdc0e3b2ce..ba24176d311e 100644
--- a/ennui.html
+++ b/ennui.html
@@ -38,93 +38,61 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ennui
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ennui
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ennui
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ennui
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ennui
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing ennui
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced ennui
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ennui
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-libs/boost-1.63.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-libs/boost-1.63.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/boost-build-1.60.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-util/boost-build-1.60.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-libs/libtorrent-rasterbar-1.1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-libs/libtorrent-rasterbar-1.1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-wireless/wpa_supplicant-2.8-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-wireless/wpa_supplicant-2.8-r1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * x11-libs/vte-0.28.2-r208: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-libs/vte-0.28.2-r208: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/ennui.txt b/ennui.txt
index b55ddc2a0020..e7df6b0c1136 100644
--- a/ennui.txt
+++ b/ennui.txt
@@ -12,39 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/ennui.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ennui
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ennui
-Cloning into '/var/lib/repo-mirror-ci/sync/ennui'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ennui
* Sync succeeded
$ git log --format=%ci -1
diff --git a/equaeghe.html b/equaeghe.html
index 9f34962ee917..0c37837d4fd8 100644
--- a/equaeghe.html
+++ b/equaeghe.html
@@ -36,81 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync equaeghe
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync equaeghe
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing equaeghe
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced equaeghe
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 equaeghe
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing equaeghe
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced equaeghe
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 equaeghe
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/equaeghe.txt b/equaeghe.txt
index 03c64ff0809c..0aa2ecb6e4a2 100644
--- a/equaeghe.txt
+++ b/equaeghe.txt
@@ -11,38 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/equaeghe/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync equaeghe
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing equaeghe
-Cloning into '/var/lib/repo-mirror-ci/sync/equaeghe'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced equaeghe
* Sync succeeded
$ git log --format=%ci -1
diff --git a/erayd.html b/erayd.html
index fa94f56f1d99..c9ada3bc5f88 100644
--- a/erayd.html
+++ b/erayd.html
@@ -34,83 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync erayd
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync erayd
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing erayd
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:einflay repo at &#x27;/var/lib/repo-mirror-ci/sync/einflay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ejabberd repo at &#x27;/var/lib/repo-mirror-ci/sync/ejabberd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced erayd
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 erayd
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing erayd
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced erayd
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 erayd
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/erayd.txt b/erayd.txt
index 63c8e0f256f4..b083cd526961 100644
--- a/erayd.txt
+++ b/erayd.txt
@@ -10,39 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/erayd/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:erayd/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync erayd
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:einflay repo at '/var/lib/repo-mirror-ci/sync/einflay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ejabberd repo at '/var/lib/repo-mirror-ci/sync/ejabberd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing erayd
-Cloning into '/var/lib/repo-mirror-ci/sync/erayd'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced erayd
* Sync succeeded
$ git log --format=%ci -1
diff --git a/escpr2.html b/escpr2.html
index 1146872adcba..483565518e71 100644
--- a/escpr2.html
+++ b/escpr2.html
@@ -32,85 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync escpr2
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync escpr2
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing escpr2
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced escpr2
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 escpr2
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing escpr2
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced escpr2
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 escpr2
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/escpr2.txt b/escpr2.txt
index 227cc2268443..c2cf7da095a4 100644
--- a/escpr2.txt
+++ b/escpr2.txt
@@ -9,40 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync escpr2
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing escpr2
-Cloning into '/var/lib/repo-mirror-ci/sync/escpr2'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced escpr2
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ethereum.html b/ethereum.html
index 3b9cf71c8a9c..de3215b800e8 100644
--- a/ethereum.html
+++ b/ethereum.html
@@ -38,85 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ethereum
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ethereum
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ethereum
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ethereum
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ethereum
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing ethereum
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced ethereum
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ethereum
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ethereum.txt b/ethereum.txt
index a6528b4da08a..dc8189cfcb98 100644
--- a/ethereum.txt
+++ b/ethereum.txt
@@ -12,40 +12,23 @@
{'type': 'git',
'uri': 'git@github.com:coolparadox/ethereum-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ethereum
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ethereum
-Cloning into '/var/lib/repo-mirror-ci/sync/ethereum'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ethereum
* Sync succeeded
$ git log --format=%ci -1
diff --git a/eugene-bright.html b/eugene-bright.html
index 2d2d849fa687..2389ead3e0b9 100644
--- a/eugene-bright.html
+++ b/eugene-bright.html
@@ -36,83 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync eugene-bright
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync eugene-bright
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing eugene-bright
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced eugene-bright
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eugene-bright
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing eugene-bright
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced eugene-bright
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 eugene-bright
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/eugene-bright.txt b/eugene-bright.txt
index 4f0e6cd45987..54ec8c27fd9d 100644
--- a/eugene-bright.txt
+++ b/eugene-bright.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:eugene-bright/eugene-bright-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync eugene-bright
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing eugene-bright
-Cloning into '/var/lib/repo-mirror-ci/sync/eugene-bright'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced eugene-bright
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ext-devlibs.html b/ext-devlibs.html
index 0b3d57703a98..fe7bb5d402e0 100644
--- a/ext-devlibs.html
+++ b/ext-devlibs.html
@@ -36,83 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ext-devlibs
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ext-devlibs
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ext-devlibs
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ext-devlibs
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ext-devlibs
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing ext-devlibs
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced ext-devlibs
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ext-devlibs
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ext-devlibs.txt b/ext-devlibs.txt
index 7bd25b5e54aa..d7a58357aac8 100644
--- a/ext-devlibs.txt
+++ b/ext-devlibs.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'git@gitlab.com:extsidvind/ext-devlibs.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ext-devlibs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ext-devlibs
-Cloning into '/var/lib/repo-mirror-ci/sync/ext-devlibs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ext-devlibs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/farmboy0.html b/farmboy0.html
index 0980602ce6d4..90f0f87abad0 100644
--- a/farmboy0.html
+++ b/farmboy0.html
@@ -40,83 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync farmboy0
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync farmboy0
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing farmboy0
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced farmboy0
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 farmboy0
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing farmboy0
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced farmboy0
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 farmboy0
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/farmboy0.txt b/farmboy0.txt
index e3ec5a32b36d..a20e2795a85b 100644
--- a/farmboy0.txt
+++ b/farmboy0.txt
@@ -13,39 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:farmboy0/portage-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync farmboy0
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing farmboy0
-Cloning into '/var/lib/repo-mirror-ci/sync/farmboy0'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced farmboy0
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fem-overlay.html b/fem-overlay.html
index 0559aad40a7f..5d4564d51ccc 100644
--- a/fem-overlay.html
+++ b/fem-overlay.html
@@ -30,83 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fem-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync fem-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing fem-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced fem-overlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fem-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing fem-overlay
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced fem-overlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fem-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fem-overlay.txt b/fem-overlay.txt
index 6409c8dda525..68f9ef5e9284 100644
--- a/fem-overlay.txt
+++ b/fem-overlay.txt
@@ -8,39 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fem-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fem-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/fem-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fem-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ferki.html b/ferki.html
index 91981fc446e7..215ed0247466 100644
--- a/ferki.html
+++ b/ferki.html
@@ -36,83 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ferki
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ferki
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing ferki
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced ferki
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ferki
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing ferki
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced ferki
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ferki
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ferki.txt b/ferki.txt
index 5ab27d68ab23..290c5d455e73 100644
--- a/ferki.txt
+++ b/ferki.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/ferki/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ferki
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ferki
-Cloning into '/var/lib/repo-mirror-ci/sync/ferki'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ferki
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fidonet.html b/fidonet.html
index 84cb28442dd0..99adefdc5d16 100644
--- a/fidonet.html
+++ b/fidonet.html
@@ -28,121 +28,59 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync fidonet
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fidonet
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing fidonet
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>This is overlay.junc.org.
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of files: 1 (reg: 1)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Number of regular files transferred: 1
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Total file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:eclipse repo at &#x27;/var/lib/repo-mirror-ci/sync/eclipse&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Total transferred file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:eigenlay repo at &#x27;/var/lib/repo-mirror-ci/sync/eigenlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Literal data: 32 bytes
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:electron repo at &#x27;/var/lib/repo-mirror-ci/sync/electron&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list size: 48
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total bytes sent: 85
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total bytes received: 134
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>sent 85 bytes received 134 bytes 87.60 bytes/sec
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced fidonet
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fidonet
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing fidonet
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>This is overlay.junc.org.
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of files: 181 (reg: 129, dir: 52)
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of created files: 181 (reg: 129, dir: 52)
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Number of regular files transferred: 129
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Total file size: 168.84K bytes
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Total transferred file size: 168.84K bytes
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Literal data: 168.84K bytes
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list size: 5.38K
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Total bytes sent: 2.76K
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Total bytes received: 91.84K
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>sent 2.76K bytes received 91.84K bytes 27.03K bytes/sec
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>total size is 168.84K speedup is 1.78
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced fidonet
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fidonet
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fidonet.txt b/fidonet.txt
index 1b1db1c6e897..0a4730d9fdac 100644
--- a/fidonet.txt
+++ b/fidonet.txt
@@ -7,59 +7,28 @@
'source': [{'type': 'rsync',
'uri': 'rsync://fidonet.overlay.junc.org/fidonet/'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fidonet
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eclipse repo at '/var/lib/repo-mirror-ci/sync/eclipse', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eigenlay repo at '/var/lib/repo-mirror-ci/sync/eigenlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:electron repo at '/var/lib/repo-mirror-ci/sync/electron', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fidonet
This is overlay.junc.org.
-Number of files: 181 (reg: 129, dir: 52)
-Number of created files: 181 (reg: 129, dir: 52)
+Number of files: 1 (reg: 1)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 129
-Total file size: 168.84K bytes
-Total transferred file size: 168.84K bytes
-Literal data: 168.84K bytes
+Number of regular files transferred: 1
+Total file size: 32 bytes
+Total transferred file size: 32 bytes
+Literal data: 32 bytes
Matched data: 0 bytes
-File list size: 5.38K
+File list size: 48
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 2.76K
-Total bytes received: 91.84K
+Total bytes sent: 85
+Total bytes received: 134
-sent 2.76K bytes received 91.84K bytes 27.03K bytes/sec
-total size is 168.84K speedup is 1.78
+sent 85 bytes received 134 bytes 87.60 bytes/sec
+total size is 32 speedup is 0.15
*** synced fidonet
* Sync succeeded
$ stat --format=%y .
diff --git a/flammie.html b/flammie.html
index 2a716f72409b..e070cb7c9564 100644
--- a/flammie.html
+++ b/flammie.html
@@ -40,97 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync flammie
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync flammie
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing flammie
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:enlightenment-live repo at &#x27;/var/lib/repo-mirror-ci/sync/enlightenment-live&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:equaeghe repo at &#x27;/var/lib/repo-mirror-ci/sync/equaeghe&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:erayd repo at &#x27;/var/lib/repo-mirror-ci/sync/erayd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced flammie
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flammie
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing flammie
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced flammie
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flammie
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flammie.txt b/flammie.txt
index a955d8246bcf..a01410a16658 100644
--- a/flammie.txt
+++ b/flammie.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git://github.com/flammie/flammie-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flammie
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:enlightenment-live repo at '/var/lib/repo-mirror-ci/sync/enlightenment-live', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:equaeghe repo at '/var/lib/repo-mirror-ci/sync/equaeghe', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:erayd repo at '/var/lib/repo-mirror-ci/sync/erayd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flammie
-Cloning into '/var/lib/repo-mirror-ci/sync/flammie'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced flammie
* Sync succeeded
$ git log --format=%ci -1
diff --git a/flavour.html b/flavour.html
index fc8d46653945..55bf4d28c527 100644
--- a/flavour.html
+++ b/flavour.html
@@ -30,101 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flavour
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync flavour
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing flavour
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced flavour
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flavour
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing flavour
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced flavour
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flavour
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flavour.txt b/flavour.txt
index 46aee82f22ac..01c50cbe8193 100644
--- a/flavour.txt
+++ b/flavour.txt
@@ -8,48 +8,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/wimmuskee/flavour.git'},
{'type': 'git', 'uri': 'git://github.com/wimmuskee/flavour.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flavour
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flavour
-Cloning into '/var/lib/repo-mirror-ci/sync/flavour'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced flavour
* Sync succeeded
$ git log --format=%ci -1
diff --git a/flewkey-overlay.html b/flewkey-overlay.html
index 5a5c8ceb8923..1e736b44b5ae 100644
--- a/flewkey-overlay.html
+++ b/flewkey-overlay.html
@@ -30,101 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flewkey-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync flewkey-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing flewkey-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dilfridge repo at &#x27;/var/lib/repo-mirror-ci/sync/dilfridge&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:elementary repo at &#x27;/var/lib/repo-mirror-ci/sync/elementary&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:elopez-r-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/elopez-r-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced flewkey-overlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flewkey-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing flewkey-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced flewkey-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flewkey-overlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt
index cf5d9fc70fce..c45fb24f7776 100644
--- a/flewkey-overlay.txt
+++ b/flewkey-overlay.txt
@@ -8,48 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://git.sdf.org/flewkey/flewkey-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flewkey-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dilfridge repo at '/var/lib/repo-mirror-ci/sync/dilfridge', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elementary repo at '/var/lib/repo-mirror-ci/sync/elementary', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:elopez-r-overlay repo at '/var/lib/repo-mirror-ci/sync/elopez-r-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flewkey-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/flewkey-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced flewkey-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/flightsim.html b/flightsim.html
index 2346ef27d178..8287585db015 100644
--- a/flightsim.html
+++ b/flightsim.html
@@ -42,99 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync flightsim
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync flightsim
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing flightsim
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced flightsim
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flightsim
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing flightsim
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced flightsim
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flightsim
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flightsim.txt b/flightsim.txt
index 80d48a89da5a..e8173639b3f1 100644
--- a/flightsim.txt
+++ b/flightsim.txt
@@ -14,47 +14,23 @@
{'type': 'git',
'uri': 'git@github.com:rafaelmartins/flightsim-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flightsim
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flightsim
-Cloning into '/var/lib/repo-mirror-ci/sync/flightsim'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced flightsim
* Sync succeeded
$ git log --format=%ci -1
diff --git a/floppym.html b/floppym.html
index c635b1b22e9b..40ec18915d01 100644
--- a/floppym.html
+++ b/floppym.html
@@ -28,97 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync floppym
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync floppym
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing floppym
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced floppym
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 floppym
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing floppym
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced floppym
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 floppym
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/floppym.txt b/floppym.txt
index 2bf10aae6f0f..6a7562c07e9c 100644
--- a/floppym.txt
+++ b/floppym.txt
@@ -7,46 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/floppym/floppym'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync floppym
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing floppym
-Cloning into '/var/lib/repo-mirror-ci/sync/floppym'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced floppym
* Sync succeeded
$ git log --format=%ci -1
diff --git a/flow.html b/flow.html
index d5b5ee6eaae4..ea0fac7a85ef 100644
--- a/flow.html
+++ b/flow.html
@@ -30,97 +30,71 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync flow
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync flow
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing flow
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>From https://gitlab.com/Flow/flow-s-ebuilds
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> 3281ac6..6200559 master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Updating 3281ac6..6200559
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Fast-forward
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> app-arch/tarlz/Manifest | 1 +
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> app-arch/tarlz/metadata.xml | 8 ++++++++
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> app-arch/tarlz/tarlz-0.19.ebuild | 21 +++++++++++++++++++++
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> 3 files changed, 30 insertions(+)
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> create mode 100644 app-arch/tarlz/Manifest
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> create mode 100644 app-arch/tarlz/metadata.xml
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> create mode 100644 app-arch/tarlz/tarlz-0.19.ebuild
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced flow
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flow
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing flow
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced flow
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flow
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flow.txt b/flow.txt
index 0057392e0704..ff4e4e8f97d6 100644
--- a/flow.txt
+++ b/flow.txt
@@ -8,46 +8,33 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flow
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flow
-Cloning into '/var/lib/repo-mirror-ci/sync/flow'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+From https://gitlab.com/Flow/flow-s-ebuilds
+ 3281ac6..6200559 master -> origin/master
+Updating 3281ac6..6200559
+Fast-forward
+ app-arch/tarlz/Manifest | 1 +
+ app-arch/tarlz/metadata.xml | 8 ++++++++
+ app-arch/tarlz/tarlz-0.19.ebuild | 21 +++++++++++++++++++++
+ 3 files changed, 30 insertions(+)
+ create mode 100644 app-arch/tarlz/Manifest
+ create mode 100644 app-arch/tarlz/metadata.xml
+ create mode 100644 app-arch/tarlz/tarlz-0.19.ebuild
*** synced flow
* Sync succeeded
$ git log --format=%ci -1
diff --git a/flussence.html b/flussence.html
index d1ae29734908..7cc41f5912c9 100644
--- a/flussence.html
+++ b/flussence.html
@@ -36,97 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync flussence
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync flussence
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing flussence
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dm9pZCAq repo at &#x27;/var/lib/repo-mirror-ci/sync/dm9pZCAq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ethereum repo at &#x27;/var/lib/repo-mirror-ci/sync/ethereum&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:eugene-bright repo at &#x27;/var/lib/repo-mirror-ci/sync/eugene-bright&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:farmboy0 repo at &#x27;/var/lib/repo-mirror-ci/sync/farmboy0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced flussence
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ferki repo at &#x27;/var/lib/repo-mirror-ci/sync/ferki&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flussence
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ROKO__ repo at &#x27;/var/lib/repo-mirror-ci/sync/ROKO__&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:flammie repo at &#x27;/var/lib/repo-mirror-ci/sync/flammie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:flavour repo at &#x27;/var/lib/repo-mirror-ci/sync/flavour&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing flussence
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced flussence
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 flussence
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/flussence.txt b/flussence.txt
index a06277a0e9b3..981b60a6a737 100644
--- a/flussence.txt
+++ b/flussence.txt
@@ -11,46 +11,23 @@
{'type': 'git',
'uri': 'ssh://git@repo.or.cz/flussence-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flussence
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ethereum repo at '/var/lib/repo-mirror-ci/sync/ethereum', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:eugene-bright repo at '/var/lib/repo-mirror-ci/sync/eugene-bright', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:farmboy0 repo at '/var/lib/repo-mirror-ci/sync/farmboy0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ferki repo at '/var/lib/repo-mirror-ci/sync/ferki', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ROKO__ repo at '/var/lib/repo-mirror-ci/sync/ROKO__', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flammie repo at '/var/lib/repo-mirror-ci/sync/flammie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flavour repo at '/var/lib/repo-mirror-ci/sync/flavour', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing flussence
-Cloning into '/var/lib/repo-mirror-ci/sync/flussence'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced flussence
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fol4.html b/fol4.html
index e03ac0a26807..2f945b132d8b 100644
--- a/fol4.html
+++ b/fol4.html
@@ -28,85 +28,53 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync fol4
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fol4
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing fol4
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>warning: redirecting to https://gitlab.com/madsl/fol4.git/
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced fol4
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fol4
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** syncing fol4
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;...
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>warning: redirecting to https://gitlab.com/madsl/fol4.git/
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced fol4
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fol4
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fol4.txt b/fol4.txt
index f2af13796ae2..c7eed9908984 100644
--- a/fol4.txt
+++ b/fol4.txt
@@ -7,40 +7,24 @@
'source': [{'type': 'git', 'uri': 'https://gitlab.com/madsl/fol4'},
{'type': 'git', 'uri': 'git+ssh://git@gitlab.com/madsl/fol4.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fol4
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fol4
-Cloning into '/var/lib/repo-mirror-ci/sync/fol4'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
warning: redirecting to https://gitlab.com/madsl/fol4.git/
+Already up to date.
*** synced fol4
* Sync succeeded
$ git log --format=%ci -1
diff --git a/foo-overlay.html b/foo-overlay.html
index da387d551557..e3541f5bbbf8 100644
--- a/foo-overlay.html
+++ b/foo-overlay.html
@@ -36,83 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync foo-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync foo-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing foo-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced foo-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 foo-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing foo-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced foo-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 foo-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/foo-overlay.txt b/foo-overlay.txt
index 3dec9058fcfd..05a0c15c9490 100644
--- a/foo-overlay.txt
+++ b/foo-overlay.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'https://github.com/slashbeast/foo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync foo-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing foo-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/foo-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced foo-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fordfrog.html b/fordfrog.html
index 66c428f081cf..3f51e8360bf2 100644
--- a/fordfrog.html
+++ b/fordfrog.html
@@ -38,81 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync fordfrog
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync fordfrog
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing fordfrog
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced fordfrog
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fordfrog
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing fordfrog
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced fordfrog
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fordfrog
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fordfrog.txt b/fordfrog.txt
index c19ef56e0414..bbca9f23463a 100644
--- a/fordfrog.txt
+++ b/fordfrog.txt
@@ -12,38 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/fordfrog.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync fordfrog
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fordfrog
-Cloning into '/var/lib/repo-mirror-ci/sync/fordfrog'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fordfrog
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fowlay.html b/fowlay.html
index be8ccc9b0657..fb30658a452e 100644
--- a/fowlay.html
+++ b/fowlay.html
@@ -32,87 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync fowlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync fowlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing fowlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced fowlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fowlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing fowlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced fowlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fowlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fowlay.txt b/fowlay.txt
index f9299bc40a72..658b7db1da2d 100644
--- a/fowlay.txt
+++ b/fowlay.txt
@@ -9,41 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/fowlay/fowlay-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fowlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fowlay
-Cloning into '/var/lib/repo-mirror-ci/sync/fowlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fowlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/foxiverlay.html b/foxiverlay.html
index 4a0cf25dd070..2fc89329875e 100644
--- a/foxiverlay.html
+++ b/foxiverlay.html
@@ -34,83 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync foxiverlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync foxiverlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing foxiverlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced foxiverlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 foxiverlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing foxiverlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced foxiverlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 foxiverlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/foxiverlay.txt b/foxiverlay.txt
index 8cc73d0eda3d..5d61c580307c 100644
--- a/foxiverlay.txt
+++ b/foxiverlay.txt
@@ -10,39 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/Pekkari/foxiverlay.git'},
{'type': 'git', 'uri': 'git@github.com:Pekkari/foxiverlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync foxiverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing foxiverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/foxiverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced foxiverlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fritteli.html b/fritteli.html
index b23cf698b997..dd0472cdd6de 100644
--- a/fritteli.html
+++ b/fritteli.html
@@ -36,83 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync fritteli
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync fritteli
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing fritteli
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:escpr2 repo at &#x27;/var/lib/repo-mirror-ci/sync/escpr2&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ext-devlibs repo at &#x27;/var/lib/repo-mirror-ci/sync/ext-devlibs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flightsim repo at &#x27;/var/lib/repo-mirror-ci/sync/flightsim&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced fritteli
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fritteli
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing fritteli
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced fritteli
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fritteli
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/fritteli.txt b/fritteli.txt
index 08f28ed4c7e3..23f8cf6e3226 100644
--- a/fritteli.txt
+++ b/fritteli.txt
@@ -11,39 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/fritteli/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fritteli
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flightsim repo at '/var/lib/repo-mirror-ci/sync/flightsim', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fritteli
-Cloning into '/var/lib/repo-mirror-ci/sync/fritteli'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fritteli
* Sync succeeded
$ git log --format=%ci -1
diff --git a/frr-gentoo.html b/frr-gentoo.html
index 98e7514edc7f..471618347a80 100644
--- a/frr-gentoo.html
+++ b/frr-gentoo.html
@@ -36,87 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync frr-gentoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync frr-gentoo
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing frr-gentoo
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:floppym repo at &#x27;/var/lib/repo-mirror-ci/sync/floppym&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced frr-gentoo
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 frr-gentoo
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing frr-gentoo
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced frr-gentoo
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 frr-gentoo
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/frr-gentoo.txt b/frr-gentoo.txt
index dc1c6c889552..994161dba558 100644
--- a/frr-gentoo.txt
+++ b/frr-gentoo.txt
@@ -11,41 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:FRRouting/gentoo-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync frr-gentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:floppym repo at '/var/lib/repo-mirror-ci/sync/floppym', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing frr-gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/frr-gentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced frr-gentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fusion809.html b/fusion809.html
index 7054502854ec..07e3112f2dc7 100644
--- a/fusion809.html
+++ b/fusion809.html
@@ -36,109 +36,65 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync fusion809
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync fusion809
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing fusion809
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced fusion809
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing fusion809
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced fusion809
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
-</pre></td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-editors/gvim-8.2.2679: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-editors/gvim-8.2.2679: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-editors/vim-8.2.2679: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-editors/vim-8.2.2679: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/fusion809.txt b/fusion809.txt
index 36a8f10fa4b8..91c253b8d322 100644
--- a/fusion809.txt
+++ b/fusion809.txt
@@ -11,45 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/fusion809/fusion809-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fusion809
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fusion809
-Cloning into '/var/lib/repo-mirror-ci/sync/fusion809'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fusion809
* Sync succeeded
$ git log --format=%ci -1
diff --git a/fuverlay.html b/fuverlay.html
index cf578558f05c..aeb00ff22b84 100644
--- a/fuverlay.html
+++ b/fuverlay.html
@@ -30,101 +30,57 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync fuverlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync fuverlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing fuverlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced fuverlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fuverlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing fuverlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced fuverlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fuverlay
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-libs/libkqueue-2.3.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-libs/libkqueue-2.3.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-fonts/fira-mono-3.206: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-fonts/fira-mono-3.206: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * media-fonts/fira-sans-4.301: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-fonts/fira-sans-4.301: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/fuverlay.txt b/fuverlay.txt
index de9a5920d6f3..54dd2347c803 100644
--- a/fuverlay.txt
+++ b/fuverlay.txt
@@ -8,45 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/funkill/fuverlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync fuverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing fuverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/fuverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced fuverlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gamarouns.html b/gamarouns.html
index c2278d346233..18c768b4cce1 100644
--- a/gamarouns.html
+++ b/gamarouns.html
@@ -30,101 +30,59 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gamarouns
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gamarouns
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gamarouns
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gamarouns
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gamarouns
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing gamarouns
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced gamarouns
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gamarouns
-</pre></td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-misc/bosco-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-misc/bosco-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/sireader-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/sireader-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/spyder-3.2.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/spyder-3.2.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * sci-geosciences/geographiclib-1.50: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * sci-geosciences/geographiclib-1.50: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gamarouns.txt b/gamarouns.txt
index 782c2a4e0b80..089c2d0812d1 100644
--- a/gamarouns.txt
+++ b/gamarouns.txt
@@ -8,44 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/Amaroun/gamarouns.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gamarouns
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gamarouns
-Cloning into '/var/lib/repo-mirror-ci/sync/gamarouns'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gamarouns
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gamerlay.html b/gamerlay.html
index 0582ba96fb84..bbc46b1379d0 100644
--- a/gamerlay.html
+++ b/gamerlay.html
@@ -46,93 +46,51 @@
</pre></td></tr>
<tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync gamerlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint sync gamerlay
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing gamerlay
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced gamerlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gamerlay
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing gamerlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced gamerlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gamerlay
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gamerlay.txt b/gamerlay.txt
index 0b52eafd8a65..d69b59ffa6e1 100644
--- a/gamerlay.txt
+++ b/gamerlay.txt
@@ -16,44 +16,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/gamerlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gamerlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gamerlay
-Cloning into '/var/lib/repo-mirror-ci/sync/gamerlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gamerlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gcarq.html b/gcarq.html
index 111ebdff3213..e821d371f8dc 100644
--- a/gcarq.html
+++ b/gcarq.html
@@ -36,95 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gcarq
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gcarq
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gcarq
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced gcarq
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gcarq
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing gcarq
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced gcarq
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gcarq
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gcarq.txt b/gcarq.txt
index fa82749a9fb2..48bf8546368b 100644
--- a/gcarq.txt
+++ b/gcarq.txt
@@ -11,45 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/gcarq/gcarq-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gcarq
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gcarq
-Cloning into '/var/lib/repo-mirror-ci/sync/gcarq'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gcarq
* Sync succeeded
$ git log --format=%ci -1
diff --git a/genthree.html b/genthree.html
index e6573caba901..09bfeb2c2c26 100644
--- a/genthree.html
+++ b/genthree.html
@@ -30,107 +30,61 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync genthree
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync genthree
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing genthree
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:emacs repo at &#x27;/var/lib/repo-mirror-ci/sync/emacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ennui repo at &#x27;/var/lib/repo-mirror-ci/sync/ennui&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced genthree
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foxiverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foxiverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 genthree
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing genthree
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced genthree
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 genthree
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.36.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.36.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.01.02: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.01.02: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.04.08: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.04.08: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.11.11: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-fonts/powerline-fonts-2018.11.11: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * media-fonts/powerline-fonts-9999: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-fonts/powerline-fonts-9999: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/genthree.txt b/genthree.txt
index 2fa4fa4b7ca5..bb31e5845532 100644
--- a/genthree.txt
+++ b/genthree.txt
@@ -8,46 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://gitlab.com/genthree/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync genthree
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ennui repo at '/var/lib/repo-mirror-ci/sync/ennui', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foxiverlay repo at '/var/lib/repo-mirror-ci/sync/foxiverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing genthree
-Cloning into '/var/lib/repo-mirror-ci/sync/genthree'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced genthree
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gentoo-bootstrap.html b/gentoo-bootstrap.html
index 56f20c4befad..443bfce1fb05 100644
--- a/gentoo-bootstrap.html
+++ b/gentoo-bootstrap.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo-bootstrap
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gentoo-bootstrap
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gentoo-bootstrap
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced gentoo-bootstrap
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-bootstrap
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing gentoo-bootstrap
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced gentoo-bootstrap
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-bootstrap
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gentoo-bootstrap.txt b/gentoo-bootstrap.txt
index b6a793191604..b88631c1a9fc 100644
--- a/gentoo-bootstrap.txt
+++ b/gentoo-bootstrap.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gentoo-bootstrap
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo-bootstrap
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gentoo-bootstrap
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gentoo-clang.html b/gentoo-clang.html
index 1d87f7bc6e38..c0e793bdcea6 100644
--- a/gentoo-clang.html
+++ b/gentoo-clang.html
@@ -38,89 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gentoo-clang
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync gentoo-clang
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo-clang
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced gentoo-clang
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-clang
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing gentoo-clang
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo-clang&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced gentoo-clang
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-clang
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gentoo-clang.txt b/gentoo-clang.txt
index 72d79e7de1f1..62e553cbd1d1 100644
--- a/gentoo-clang.txt
+++ b/gentoo-clang.txt
@@ -12,42 +12,23 @@
{'type': 'git', 'uri': 'git://github.com/BilyakA/gentoo-clang.git'},
{'type': 'git', 'uri': 'git@github.com:BilyakA/gentoo-clang.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gentoo-clang
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo-clang
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-clang'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gentoo-clang
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gentoo-mate.html b/gentoo-mate.html
index 3007673965c1..c3b2930913e3 100644
--- a/gentoo-mate.html
+++ b/gentoo-mate.html
@@ -40,97 +40,55 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync gentoo-mate
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync gentoo-mate
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing gentoo-mate
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced gentoo-mate
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-mate
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing gentoo-mate
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced gentoo-mate
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-mate
-</pre></td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-editors/pluma-1.22.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-editors/pluma-1.22.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/python-caja-1.22.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/python-caja-1.22.0-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gentoo-mate.txt b/gentoo-mate.txt
index 48285cdc41dd..8e0625b25c34 100644
--- a/gentoo-mate.txt
+++ b/gentoo-mate.txt
@@ -13,44 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/gentoo-mate.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync gentoo-mate
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo-mate
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-mate'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gentoo-mate
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gentoo-zh.html b/gentoo-zh.html
index 4d552e234a6b..a09894a0be97 100644
--- a/gentoo-zh.html
+++ b/gentoo-zh.html
@@ -30,93 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gentoo-zh
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gentoo-zh
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gentoo-zh
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gentoo-zh
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-zh
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gentoo-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing gentoo-zh
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced gentoo-zh
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo-zh
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gentoo-zh.txt b/gentoo-zh.txt
index 0c1e6bb25dcb..e638e945817d 100644
--- a/gentoo-zh.txt
+++ b/gentoo-zh.txt
@@ -8,44 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/microcai/gentoo-zh.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gentoo-zh
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-clang repo at '/var/lib/repo-mirror-ci/sync/gentoo-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo-zh
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-zh'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gentoo-zh
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gentoo.html b/gentoo.html
index 3c030453f0da..2281b2242288 100644
--- a/gentoo.html
+++ b/gentoo.html
@@ -38,321 +38,101 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:apriluwu repo at &#x27;/var/lib/repo-mirror-ci/sync/apriluwu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fidonet repo at &#x27;/var/lib/repo-mirror-ci/sync/fidonet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flow repo at &#x27;/var/lib/repo-mirror-ci/sync/flow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:foo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/foo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fowlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fowlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fritteli repo at &#x27;/var/lib/repo-mirror-ci/sync/fritteli&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:frr-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/frr-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 9deb0bf5a36..47e9cf1a90a master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating 9deb0bf5a36..47e9cf1a90a
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> net-libs/courier-authlib/Manifest | 1 +
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> .../courier-authlib/courier-authlib-0.71.2.ebuild | 148 +++++++++++++++++++++
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> net-libs/courier-unicode/Manifest | 1 +
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../courier-unicode/courier-unicode-2.2.3.ebuild | 22 +++
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> net-misc/dropbox/Manifest | 2 +
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> net-misc/dropbox/dropbox-119.4.1772.ebuild | 102 ++++++++++++++
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> net-wireless/unifi/Manifest | 4 -
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> net-wireless/unifi/unifi-6.1.61.ebuild | 68 ----------
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> net-wireless/unifi/unifi-6.1.67.ebuild | 68 ----------
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> net-wireless/unifi/unifi-6.1.69.ebuild | 68 ----------
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> net-wireless/unifi/unifi-6.1.70.ebuild | 68 ----------
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> net-wireless/unifi/unifi-6.1.71.ebuild | 2 +-
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> .../glpk/{glpk-5.0.ebuild =&gt; glpk-5.0-r1.ebuild} | 16 +++
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing gentoo
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> 13 files changed, 293 insertions(+), 277 deletions(-)
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> create mode 100644 net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> create mode 100644 net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>commands sometime before your next pull:
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> create mode 100644 net-misc/dropbox/dropbox-119.4.1772.ebuild
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> delete mode 100644 net-wireless/unifi/unifi-6.1.61.ebuild
</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> delete mode 100644 net-wireless/unifi/unifi-6.1.67.ebuild
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> git config pull.rebase true # rebase
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> delete mode 100644 net-wireless/unifi/unifi-6.1.69.ebuild
</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> git config pull.ff only # fast-forward only
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> delete mode 100644 net-wireless/unifi/unifi-6.1.70.ebuild
</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> rename sci-mathematics/glpk/{glpk-5.0.ebuild =&gt; glpk-5.0-r1.ebuild} (76%)
</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced gentoo
</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>invocation.
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> b58e9ccca0b..9deb0bf5a36 master -&gt; origin/master
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>You are not currently on a branch.
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Please specify which branch you want to merge with.
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>See git-pull(1) for details.
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> git pull &lt;remote&gt; &lt;branch&gt;
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>!!! failed syncing gentoo
-</pre></td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * Sync failed with 1
-</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * Will try to re-create
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>$ pmaint sync gentoo
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>*** syncing gentoo
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>Updating files: 16% (14200/85492)
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Updating files: 17% (14534/85492)
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Updating files: 18% (15389/85492)
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Updating files: 19% (16244/85492)
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Updating files: 20% (17099/85492)
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Updating files: 21% (17954/85492)
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Updating files: 22% (18809/85492)
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Updating files: 23% (19664/85492)
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Updating files: 24% (20519/85492)
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Updating files: 25% (21373/85492)
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Updating files: 26% (22228/85492)
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Updating files: 27% (23083/85492)
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Updating files: 28% (23938/85492)
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Updating files: 29% (24793/85492)
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Updating files: 30% (25648/85492)
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>Updating files: 31% (26503/85492)
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>Updating files: 32% (27358/85492)
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Updating files: 33% (28213/85492)
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Updating files: 33% (28651/85492)
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>Updating files: 34% (29068/85492)
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Updating files: 35% (29923/85492)
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Updating files: 36% (30778/85492)
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre>Updating files: 37% (31633/85492)
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>Updating files: 38% (32487/85492)
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>Updating files: 39% (33342/85492)
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>Updating files: 40% (34197/85492)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Updating files: 41% (35052/85492)
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Updating files: 42% (35907/85492)
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>Updating files: 43% (36762/85492)
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>Updating files: 44% (37617/85492)
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Updating files: 45% (38472/85492)
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Updating files: 46% (39327/85492)
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre>Updating files: 47% (40182/85492)
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>Updating files: 48% (41037/85492)
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>Updating files: 49% (41892/85492)
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Updating files: 50% (42746/85492)
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Updating files: 50% (43197/85492)
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Updating files: 51% (43601/85492)
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Updating files: 52% (44456/85492)
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Updating files: 53% (45311/85492)
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>Updating files: 54% (46166/85492)
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>Updating files: 55% (47021/85492)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>Updating files: 56% (47876/85492)
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>Updating files: 57% (48731/85492)
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre>Updating files: 58% (49586/85492)
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre>Updating files: 59% (50441/85492)
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>Updating files: 60% (51296/85492)
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre>Updating files: 61% (52151/85492)
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre>Updating files: 62% (53006/85492)
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre>Updating files: 63% (53860/85492)
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre>Updating files: 64% (54715/85492)
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre>Updating files: 65% (55570/85492)
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre>Updating files: 66% (56425/85492)
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre>Updating files: 66% (57189/85492)
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre>Updating files: 67% (57280/85492)
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre>Updating files: 68% (58135/85492)
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre>Updating files: 69% (58990/85492)
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre>Updating files: 70% (59845/85492)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>Updating files: 71% (60700/85492)
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre>Updating files: 72% (61555/85492)
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre>Updating files: 73% (62410/85492)
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre>Updating files: 74% (63265/85492)
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre>Updating files: 75% (64119/85492)
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre>Updating files: 76% (64974/85492)
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre>Updating files: 77% (65829/85492)
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre>Updating files: 78% (66684/85492)
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre>Updating files: 78% (67515/85492)
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre>Updating files: 79% (67539/85492)
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre>Updating files: 80% (68394/85492)
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre>Updating files: 81% (69249/85492)
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre>Updating files: 82% (70104/85492)
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre>Updating files: 83% (70959/85492)
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre>Updating files: 84% (71814/85492)
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre>Updating files: 85% (72669/85492)
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre>Updating files: 86% (73524/85492)
-</pre></td></tr>
- <tr class="" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre>Updating files: 87% (74379/85492)
-</pre></td></tr>
- <tr class="" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre>Updating files: 88% (75233/85492)
-</pre></td></tr>
- <tr class="" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre>Updating files: 89% (76088/85492)
-</pre></td></tr>
- <tr class="" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre>Updating files: 90% (76943/85492)
-</pre></td></tr>
- <tr class="" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre>Updating files: 91% (77798/85492)
-</pre></td></tr>
- <tr class="" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre>Updating files: 92% (78653/85492)
-</pre></td></tr>
- <tr class="" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre>Updating files: 93% (79508/85492)
-</pre></td></tr>
- <tr class="" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre>Updating files: 94% (80363/85492)
-</pre></td></tr>
- <tr class="" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre>Updating files: 95% (81218/85492)
-</pre></td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre>Updating files: 96% (82073/85492)
-</pre></td></tr>
- <tr class="" id="l161"><td><a href="#l161"><span>161</span></a></td><td><pre>Updating files: 97% (82928/85492)
-</pre></td></tr>
- <tr class="" id="l162"><td><a href="#l162"><span>162</span></a></td><td><pre>Updating files: 98% (83783/85492)
-</pre></td></tr>
- <tr class="" id="l163"><td><a href="#l163"><span>163</span></a></td><td><pre>Updating files: 98% (84101/85492)
-</pre></td></tr>
- <tr class="" id="l164"><td><a href="#l164"><span>164</span></a></td><td><pre>Updating files: 99% (84638/85492)
-</pre></td></tr>
- <tr class="" id="l165"><td><a href="#l165"><span>165</span></a></td><td><pre>Updating files: 100% (85492/85492)
-</pre></td></tr>
- <tr class="" id="l166"><td><a href="#l166"><span>166</span></a></td><td><pre>Updating files: 100% (85492/85492), done.
-</pre></td></tr>
- <tr class="" id="l167"><td><a href="#l167"><span>167</span></a></td><td><pre>*** synced gentoo
-</pre></td></tr>
- <tr class="" id="l168"><td><a href="#l168"><span>168</span></a></td><td><pre> * Sync succeeded after re-adding
-</pre></td></tr>
- <tr class="" id="l169"><td><a href="#l169"><span>169</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l170"><td><a href="#l170"><span>170</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l171"><td><a href="#l171"><span>171</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
-</pre></td></tr>
- <tr class="" id="l172"><td><a href="#l172"><span>172</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gentoo.txt b/gentoo.txt
index 420a02fa67c1..2078852b7c36 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -12,39 +12,8 @@
'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}],
'status': 'official'}
$ pmaint sync gentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:apriluwu repo at '/var/lib/repo-mirror-ci/sync/apriluwu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fidonet repo at '/var/lib/repo-mirror-ci/sync/fidonet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flow repo at '/var/lib/repo-mirror-ci/sync/flow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:foo-overlay repo at '/var/lib/repo-mirror-ci/sync/foo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fowlay repo at '/var/lib/repo-mirror-ci/sync/fowlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fritteli repo at '/var/lib/repo-mirror-ci/sync/fritteli', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:frr-gentoo repo at '/var/lib/repo-mirror-ci/sync/frr-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoo
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
@@ -60,22 +29,33 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- b58e9ccca0b..9deb0bf5a36 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 sync gentoo
-*** syncing gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 16% (14200/85492) Updating files: 17% (14534/85492) Updating files: 18% (15389/85492) Updating files: 19% (16244/85492) Updating files: 20% (17099/85492) Updating files: 21% (17954/85492) Updating files: 22% (18809/85492) Updating files: 23% (19664/85492) Updating files: 24% (20519/85492) Updating files: 25% (21373/85492) Updating files: 26% (22228/85492) Updating files: 27% (23083/85492) Updating files: 28% (23938/85492) Updating files: 29% (24793/85492) Updating files: 30% (25648/85492) Updating files: 31% (26503/85492) Updating files: 32% (27358/85492) Updating files: 33% (28213/85492) Updating files: 33% (28651/85492) Updating files: 34% (29068/85492) Updating files: 35% (29923/85492) Updating files: 36% (30778/85492) Updating files: 37% (31633/85492) Updating files: 38% (32487/85492) Updating files: 39% (33342/85492) Updating files: 40% (34197/85492) Updating files: 41% (35052/85492) Updating files: 42% (35907/85492) Updating files: 43% (36762/85492) Updating files: 44% (37617/85492) Updating files: 45% (38472/85492) Updating files: 46% (39327/85492) Updating files: 47% (40182/85492) Updating files: 48% (41037/85492) Updating files: 49% (41892/85492) Updating files: 50% (42746/85492) Updating files: 50% (43197/85492) Updating files: 51% (43601/85492) Updating files: 52% (44456/85492) Updating files: 53% (45311/85492) Updating files: 54% (46166/85492) Updating files: 55% (47021/85492) Updating files: 56% (47876/85492) Updating files: 57% (48731/85492) Updating files: 58% (49586/85492) Updating files: 59% (50441/85492) Updating files: 60% (51296/85492) Updating files: 61% (52151/85492) Updating files: 62% (53006/85492) Updating files: 63% (53860/85492) Updating files: 64% (54715/85492) Updating files: 65% (55570/85492) Updating files: 66% (56425/85492) Updating files: 66% (57189/85492) Updating files: 67% (57280/85492) Updating files: 68% (58135/85492) Updating files: 69% (58990/85492) Updating files: 70% (59845/85492) Updating files: 71% (60700/85492) Updating files: 72% (61555/85492) Updating files: 73% (62410/85492) Updating files: 74% (63265/85492) Updating files: 75% (64119/85492) Updating files: 76% (64974/85492) Updating files: 77% (65829/85492) Updating files: 78% (66684/85492) Updating files: 78% (67515/85492) Updating files: 79% (67539/85492) Updating files: 80% (68394/85492) Updating files: 81% (69249/85492) Updating files: 82% (70104/85492) Updating files: 83% (70959/85492) Updating files: 84% (71814/85492) Updating files: 85% (72669/85492) Updating files: 86% (73524/85492) Updating files: 87% (74379/85492) Updating files: 88% (75233/85492) Updating files: 89% (76088/85492) Updating files: 90% (76943/85492) Updating files: 91% (77798/85492) Updating files: 92% (78653/85492) Updating files: 93% (79508/85492) Updating files: 94% (80363/85492) Updating files: 95% (81218/85492) Updating files: 96% (82073/85492) Updating files: 97% (82928/85492) Updating files: 98% (83783/85492) Updating files: 98% (84101/85492) Updating files: 99% (84638/85492) Updating files: 100% (85492/85492) Updating files: 100% (85492/85492), done.
+ 9deb0bf5a36..47e9cf1a90a master -> origin/master
+Updating 9deb0bf5a36..47e9cf1a90a
+Fast-forward
+ net-libs/courier-authlib/Manifest | 1 +
+ .../courier-authlib/courier-authlib-0.71.2.ebuild | 148 +++++++++++++++++++++
+ net-libs/courier-unicode/Manifest | 1 +
+ .../courier-unicode/courier-unicode-2.2.3.ebuild | 22 +++
+ net-misc/dropbox/Manifest | 2 +
+ net-misc/dropbox/dropbox-119.4.1772.ebuild | 102 ++++++++++++++
+ net-wireless/unifi/Manifest | 4 -
+ net-wireless/unifi/unifi-6.1.61.ebuild | 68 ----------
+ net-wireless/unifi/unifi-6.1.67.ebuild | 68 ----------
+ net-wireless/unifi/unifi-6.1.69.ebuild | 68 ----------
+ net-wireless/unifi/unifi-6.1.70.ebuild | 68 ----------
+ net-wireless/unifi/unifi-6.1.71.ebuild | 2 +-
+ .../glpk/{glpk-5.0.ebuild => glpk-5.0-r1.ebuild} | 16 +++
+ 13 files changed, 293 insertions(+), 277 deletions(-)
+ create mode 100644 net-libs/courier-authlib/courier-authlib-0.71.2.ebuild
+ create mode 100644 net-libs/courier-unicode/courier-unicode-2.2.3.ebuild
+ create mode 100644 net-misc/dropbox/dropbox-119.4.1772.ebuild
+ delete mode 100644 net-wireless/unifi/unifi-6.1.61.ebuild
+ delete mode 100644 net-wireless/unifi/unifi-6.1.67.ebuild
+ delete mode 100644 net-wireless/unifi/unifi-6.1.69.ebuild
+ delete mode 100644 net-wireless/unifi/unifi-6.1.70.ebuild
+ rename sci-mathematics/glpk/{glpk-5.0.ebuild => glpk-5.0-r1.ebuild} (76%)
*** 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 32 gentoo
diff --git a/gentoobr.html b/gentoobr.html
index 66c6165c040e..bd31efe68259 100644
--- a/gentoobr.html
+++ b/gentoobr.html
@@ -52,93 +52,51 @@
</pre></td></tr>
<tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>$ pmaint sync gentoobr
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint sync gentoobr
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing gentoobr
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:distros repo at &#x27;/var/lib/repo-mirror-ci/sync/distros&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gcarq repo at &#x27;/var/lib/repo-mirror-ci/sync/gcarq&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** synced gentoobr
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gentoo-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoobr
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** syncing gentoobr
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;...
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced gentoobr
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoobr
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gentoobr.txt b/gentoobr.txt
index 0de0737dd9ad..4cd451d46ce1 100644
--- a/gentoobr.txt
+++ b/gentoobr.txt
@@ -19,44 +19,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/gentoobr/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gentoobr
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gcarq repo at '/var/lib/repo-mirror-ci/sync/gcarq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-clang repo at '/var/lib/repo-mirror-ci/sync/gentoo-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gentoobr
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoobr'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gentoobr
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gerislay.html b/gerislay.html
index 1a45b1dc2446..d1d40c092220 100644
--- a/gerislay.html
+++ b/gerislay.html
@@ -42,87 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync gerislay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync gerislay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gerislay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fuverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fuverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gamarouns repo at &#x27;/var/lib/repo-mirror-ci/sync/gamarouns&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gentoo-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced gerislay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gerislay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing gerislay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced gerislay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gerislay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gerislay.txt b/gerislay.txt
index 13a2b42fbc9c..fe3aa56aeda4 100644
--- a/gerislay.txt
+++ b/gerislay.txt
@@ -14,41 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/gerislay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gerislay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fuverlay repo at '/var/lib/repo-mirror-ci/sync/fuverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamarouns repo at '/var/lib/repo-mirror-ci/sync/gamarouns', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-clang repo at '/var/lib/repo-mirror-ci/sync/gentoo-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gerislay
-Cloning into '/var/lib/repo-mirror-ci/sync/gerislay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gerislay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gig.html b/gig.html
index 1587e1acdbbe..6f204007371d 100644
--- a/gig.html
+++ b/gig.html
@@ -26,331 +26,57 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync gig
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync gig
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing gig
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced gig
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gig
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** syncing gig
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;...
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced gig
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gig
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7fa8c9575280&gt;
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20754&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * app-admin/sosreport-3.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-admin/sosreport-3.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * media-sound/scdl-1.3.3_beta1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * media-sound/scdl-1.3.3_beta1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * media-sound/scdl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * media-sound/scdl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20754&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20754&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;20754&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20754&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7fa8c9c604c0&gt;
-</pre></td></tr>
- <tr class="" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l161"><td><a href="#l161"><span>161</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l162"><td><a href="#l162"><span>162</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l163"><td><a href="#l163"><span>163</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l164"><td><a href="#l164"><span>164</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l165"><td><a href="#l165"><span>165</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l166"><td><a href="#l166"><span>166</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l167"><td><a href="#l167"><span>167</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l168"><td><a href="#l168"><span>168</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l169"><td><a href="#l169"><span>169</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l170"><td><a href="#l170"><span>170</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;20754&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l171"><td><a href="#l171"><span>171</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gig.txt b/gig.txt
index a324e9f2e931..6e6e0d4f53f2 100644
--- a/gig.txt
+++ b/gig.txt
@@ -6,166 +6,29 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/Gig-OS/gig.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gig
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-clang repo at '/var/lib/repo-mirror-ci/sync/gentoo-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gig
-Cloning into '/var/lib/repo-mirror-ci/sync/gig'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gig
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gig
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7fa8c9575280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20754' appears dead, timing out
* app-admin/sosreport-3.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* media-sound/scdl-1.3.3_beta1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* media-sound/scdl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20754' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20754' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '20754' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20754' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7fa8c9c604c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '20754' appears dead, timing out
* Cache regen failed with 1
diff --git a/gitlab.html b/gitlab.html
index 2ad83072a525..720234634df8 100644
--- a/gitlab.html
+++ b/gitlab.html
@@ -30,83 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gitlab
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gitlab
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing gitlab
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced gitlab
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gitlab
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing gitlab
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced gitlab
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gitlab
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gitlab.txt b/gitlab.txt
index e6ed0123c12d..ce6dea2016cb 100644
--- a/gitlab.txt
+++ b/gitlab.txt
@@ -8,39 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.awesome-it.de/overlays/gitlab.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gitlab
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gitlab
-Cloning into '/var/lib/repo-mirror-ci/sync/gitlab'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gitlab
* Sync succeeded
$ git log --format=%ci -1
diff --git a/glarbs-overlay.html b/glarbs-overlay.html
index 05f9071bd219..ed587de0260d 100644
--- a/glarbs-overlay.html
+++ b/glarbs-overlay.html
@@ -34,83 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync glarbs-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync glarbs-overlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing glarbs-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fusion809 repo at &#x27;/var/lib/repo-mirror-ci/sync/fusion809&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced glarbs-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 glarbs-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing glarbs-overlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced glarbs-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 glarbs-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/glarbs-overlay.txt b/glarbs-overlay.txt
index d6c58190f90a..c8ce42fc6b91 100644
--- a/glarbs-overlay.txt
+++ b/glarbs-overlay.txt
@@ -10,39 +10,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/et-8/glarbs-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync glarbs-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fusion809 repo at '/var/lib/repo-mirror-ci/sync/fusion809', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing glarbs-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/glarbs-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced glarbs-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gnome-next.html b/gnome-next.html
index ba52beb88f1c..9b8431d3b6c4 100644
--- a/gnome-next.html
+++ b/gnome-next.html
@@ -34,87 +34,55 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync gnome-next
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gnome-next
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gnome-next
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced gnome-next
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnome-next
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing gnome-next
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced gnome-next
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnome-next
-</pre></td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * gnome-extra/budgie-desktop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * gnome-extra/budgie-desktop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * x11-libs/bamf-0.5.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * x11-libs/bamf-0.5.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gnome-next.txt b/gnome-next.txt
index f663813396da..57acf19e8f41 100644
--- a/gnome-next.txt
+++ b/gnome-next.txt
@@ -10,39 +10,23 @@
'uri': 'https://github.com/Heather/gentoo-gnome.git'},
{'type': 'git', 'uri': 'git@github.com:Heather/gentoo-gnome.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gnome-next
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gnome-next
-Cloning into '/var/lib/repo-mirror-ci/sync/gnome-next'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gnome-next
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gnome.html b/gnome.html
index 914fd7e79428..33bff63c8363 100644
--- a/gnome.html
+++ b/gnome.html
@@ -38,107 +38,73 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gnome
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync gnome
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gnome
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flewkey-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/flewkey-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fol4 repo at &#x27;/var/lib/repo-mirror-ci/sync/fol4&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced gnome
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnome
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing gnome
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced gnome
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnome
-</pre></td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-emulation/libvirt-glib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-emulation/libvirt-glib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-office/planner-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-office/planner-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-text/libgxps-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/libgxps-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-libs/glib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-libs/glib-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/pyatspi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pyatspi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-util/gdbus-codegen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-util/gdbus-codegen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * gnome-extra/evolution-groupwise-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * gnome-extra/evolution-groupwise-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * gnome-extra/libgda-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * gnome-extra/libgda-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-libs/mash-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * media-libs/mash-9999: failed sourcing ebuild: EAPI=4 is not supported, (gnome2-utils.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * net-libs/gtk-vnc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * net-libs/gtk-vnc-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-misc/spice-gtk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * net-misc/spice-gtk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gnome.txt b/gnome.txt
index 7d7aceacd153..41ce88f6453f 100644
--- a/gnome.txt
+++ b/gnome.txt
@@ -12,40 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/gnome.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync gnome
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fol4 repo at '/var/lib/repo-mirror-ci/sync/fol4', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gnome
-Cloning into '/var/lib/repo-mirror-ci/sync/gnome'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gnome
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gnuradio.html b/gnuradio.html
index 50919ff7d342..a7034a06ad25 100644
--- a/gnuradio.html
+++ b/gnuradio.html
@@ -28,85 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync gnuradio
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync gnuradio
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing gnuradio
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced gnuradio
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnuradio
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing gnuradio
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced gnuradio
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnuradio
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gnuradio.txt b/gnuradio.txt
index d47ed4d5c0e9..8137dae846de 100644
--- a/gnuradio.txt
+++ b/gnuradio.txt
@@ -7,40 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/hololeap/gentoo-gnuradio'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gnuradio
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gnuradio
-Cloning into '/var/lib/repo-mirror-ci/sync/gnuradio'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gnuradio
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gnustep.html b/gnustep.html
index 12a3cf081708..e4f2a9d0225a 100644
--- a/gnustep.html
+++ b/gnustep.html
@@ -36,85 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gnustep
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync gnustep
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing gnustep
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:genthree repo at &#x27;/var/lib/repo-mirror-ci/sync/genthree&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced gnustep
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnustep
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing gnustep
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced gnustep
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnustep
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gnustep.txt b/gnustep.txt
index 9af6284dacd0..7629c7b40113 100644
--- a/gnustep.txt
+++ b/gnustep.txt
@@ -11,40 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/gnustep.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync gnustep
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:genthree repo at '/var/lib/repo-mirror-ci/sync/genthree', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gnustep
-Cloning into '/var/lib/repo-mirror-ci/sync/gnustep'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gnustep
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gnux32.html b/gnux32.html
index 42c70018696f..f2211c40c859 100644
--- a/gnux32.html
+++ b/gnux32.html
@@ -32,117 +32,75 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync gnux32
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync gnux32
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing gnux32
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced gnux32
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnux32
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing gnux32
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced gnux32
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gnux32
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-libs/boost-1.65.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-libs/boost-1.65.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-util/boost-build-1.65.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-util/boost-build-1.65.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-util/boost-build-1.70.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-util/boost-build-1.70.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-util/boost-build-1.71.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-util/boost-build-1.71.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * media-gfx/graphite2-1.3.10: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-gfx/graphite2-1.3.10: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * media-gfx/graphite2-1.3.11-r1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-gfx/graphite2-1.3.11-r1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * media-gfx/graphite2-1.3.12-r1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-gfx/graphite2-1.3.12-r1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-gfx/graphviz-2.40.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-gfx/graphviz-2.40.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * media-gfx/graphviz-2.42.1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-gfx/graphviz-2.42.1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.2: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * media-libs/libjpeg-turbo-2.0.2: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/gnux32.txt b/gnux32.txt
index dee1be4b0cd2..ba0abf36ead8 100644
--- a/gnux32.txt
+++ b/gnux32.txt
@@ -9,44 +9,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/1camper/gnux32.git'},
{'type': 'git', 'uri': 'git://github.com/1camper/gnux32.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gnux32
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gnux32
-Cloning into '/var/lib/repo-mirror-ci/sync/gnux32'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gnux32
* Sync succeeded
$ git log --format=%ci -1
diff --git a/go-overlay.html b/go-overlay.html
index 7d8af47974b7..e3daa412d279 100644
--- a/go-overlay.html
+++ b/go-overlay.html
@@ -30,93 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync go-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync go-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing go-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced go-overlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 go-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing go-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced go-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 go-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/go-overlay.txt b/go-overlay.txt
index 828636d6db95..4fe1e21a24fa 100644
--- a/go-overlay.txt
+++ b/go-overlay.txt
@@ -8,44 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/Dr-Terrible/go-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync go-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing go-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/go-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced go-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/godin.html b/godin.html
index 74fae6084455..557a321681fb 100644
--- a/godin.html
+++ b/godin.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync godin
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync godin
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing godin
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced godin
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 godin
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing godin
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced godin
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 godin
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/godin.txt b/godin.txt
index 7bb82f2854bb..c6b634c757ff 100644
--- a/godin.txt
+++ b/godin.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/Godin/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync godin
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing godin
-Cloning into '/var/lib/repo-mirror-ci/sync/godin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced godin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/goduck777.html b/goduck777.html
index 737fae250f74..2a2c8c99beb3 100644
--- a/goduck777.html
+++ b/goduck777.html
@@ -40,93 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync goduck777
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync goduck777
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing goduck777
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-bootstrap repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-bootstrap&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gentoobr repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoobr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gig repo at &#x27;/var/lib/repo-mirror-ci/sync/gig&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced goduck777
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goduck777
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing goduck777
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced goduck777
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goduck777
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/goduck777.txt b/goduck777.txt
index c7ada8da5424..3fd0bb99e7f0 100644
--- a/goduck777.txt
+++ b/goduck777.txt
@@ -13,44 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:goduck777/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync goduck777
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-bootstrap repo at '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoobr repo at '/var/lib/repo-mirror-ci/sync/gentoobr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gig repo at '/var/lib/repo-mirror-ci/sync/gig', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing goduck777
-Cloning into '/var/lib/repo-mirror-ci/sync/goduck777'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced goduck777
* Sync succeeded
$ git log --format=%ci -1
diff --git a/goris.html b/goris.html
index a2ee839d4707..5cf833524112 100644
--- a/goris.html
+++ b/goris.html
@@ -40,109 +40,63 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync goris
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync goris
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing goris
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced goris
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goris
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing goris
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced goris
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 goris
-</pre></td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * media-fonts/arian-amu-3.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-fonts/arian-amu-3.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-fonts/arian-amu-4.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-fonts/arian-amu-4.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * media-fonts/arian-amu-mono-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-fonts/arian-amu-mono-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * media-fonts/arian-amu-serif-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-fonts/arian-amu-serif-1.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * media-fonts/arian-grqi-2.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-fonts/arian-grqi-2.0: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * media-fonts/ghea-unicode-fonts-1.006: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-fonts/ghea-unicode-fonts-1.006: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/goris.txt b/goris.txt
index 6ed322e5d467..4d79db43ec25 100644
--- a/goris.txt
+++ b/goris.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/goris.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync goris
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing goris
-Cloning into '/var/lib/repo-mirror-ci/sync/goris'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced goris
* Sync succeeded
$ git log --format=%ci -1
diff --git a/graaff.html b/graaff.html
index 229aa70b2b87..57f4a1767e9b 100644
--- a/graaff.html
+++ b/graaff.html
@@ -42,99 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync graaff
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync graaff
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing graaff
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced graaff
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 graaff
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing graaff
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced graaff
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 graaff
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/graaff.txt b/graaff.txt
index 277c7109e00b..d7d16a1ae7fa 100644
--- a/graaff.txt
+++ b/graaff.txt
@@ -14,47 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/graaff.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync graaff
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing graaff
-Cloning into '/var/lib/repo-mirror-ci/sync/graaff'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced graaff
* Sync succeeded
$ git log --format=%ci -1
diff --git a/griffon_overlay.html b/griffon_overlay.html
index 6ca97840f4d5..79bf672482af 100644
--- a/griffon_overlay.html
+++ b/griffon_overlay.html
@@ -36,97 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync griffon_overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync griffon_overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing griffon_overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnuradio repo at &#x27;/var/lib/repo-mirror-ci/sync/gnuradio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced griffon_overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 griffon_overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing griffon_overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced griffon_overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 griffon_overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/griffon_overlay.txt b/griffon_overlay.txt
index dfdfd698eb74..099777862f61 100644
--- a/griffon_overlay.txt
+++ b/griffon_overlay.txt
@@ -11,46 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/windfail/griffon_overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync griffon_overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnuradio repo at '/var/lib/repo-mirror-ci/sync/gnuradio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing griffon_overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/griffon_overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced griffon_overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/grub2-themes.html b/grub2-themes.html
index 104ffccfdf78..e40b895ab18d 100644
--- a/grub2-themes.html
+++ b/grub2-themes.html
@@ -38,105 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync grub2-themes
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync grub2-themes
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing grub2-themes
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced grub2-themes
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 grub2-themes
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing grub2-themes
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced grub2-themes
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 grub2-themes
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/grub2-themes.txt b/grub2-themes.txt
index f4240ae0d710..9817277398d0 100644
--- a/grub2-themes.txt
+++ b/grub2-themes.txt
@@ -12,50 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync grub2-themes
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing grub2-themes
-Cloning into '/var/lib/repo-mirror-ci/sync/grub2-themes'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced grub2-themes
* Sync succeeded
$ git log --format=%ci -1
diff --git a/gsview-overlay.html b/gsview-overlay.html
index 784fd27efd0b..2b4cf7d54f39 100644
--- a/gsview-overlay.html
+++ b/gsview-overlay.html
@@ -42,105 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync gsview-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync gsview-overlay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing gsview-overlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced gsview-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gsview-overlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing gsview-overlay
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** synced gsview-overlay
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gsview-overlay
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/gsview-overlay.txt b/gsview-overlay.txt
index b802f210a66e..cd03dd6cc482 100644
--- a/gsview-overlay.txt
+++ b/gsview-overlay.txt
@@ -14,50 +14,23 @@
{'type': 'git',
'uri': 'git@github.com:uleysky/gsview-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync gsview-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing gsview-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/gsview-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced gsview-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/guru.html b/guru.html
index 19fe3d45237a..d1fb5432647b 100644
--- a/guru.html
+++ b/guru.html
@@ -34,107 +34,55 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync guru
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync guru
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing guru
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:glarbs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/glarbs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/proj/guru
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> aee053e7..1ee4fb89 dev -&gt; origin/dev
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced guru
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:godin repo at &#x27;/var/lib/repo-mirror-ci/sync/godin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:goduck777 repo at &#x27;/var/lib/repo-mirror-ci/sync/goduck777&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 guru
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:gsview-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing guru
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced guru
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 guru
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/guru.txt b/guru.txt
index 9ffa92169009..b1c3482c91db 100644
--- a/guru.txt
+++ b/guru.txt
@@ -10,51 +10,25 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/guru.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync guru
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:glarbs-overlay repo at '/var/lib/repo-mirror-ci/sync/glarbs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:godin repo at '/var/lib/repo-mirror-ci/sync/godin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goduck777 repo at '/var/lib/repo-mirror-ci/sync/goduck777', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gsview-overlay repo at '/var/lib/repo-mirror-ci/sync/gsview-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing guru
-Cloning into '/var/lib/repo-mirror-ci/sync/guru'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+From https://anongit.gentoo.org/git/repo/proj/guru
+ aee053e7..1ee4fb89 dev -> origin/dev
+Already up to date.
*** synced guru
* Sync succeeded
$ git log --format=%ci -1
diff --git a/haarp.html b/haarp.html
index ebc0ba725d10..609f343e321f 100644
--- a/haarp.html
+++ b/haarp.html
@@ -28,105 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync haarp
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync haarp
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing haarp
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced haarp
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haarp
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:gsview-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing haarp
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced haarp
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haarp
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/haarp.txt b/haarp.txt
index 3abe57ae2707..879e2e2cfd1e 100644
--- a/haarp.txt
+++ b/haarp.txt
@@ -7,50 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/haarp.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync haarp
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gsview-overlay repo at '/var/lib/repo-mirror-ci/sync/gsview-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing haarp
-Cloning into '/var/lib/repo-mirror-ci/sync/haarp'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced haarp
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hamper-overlay.html b/hamper-overlay.html
index 5992d5427137..06a5a40baea1 100644
--- a/hamper-overlay.html
+++ b/hamper-overlay.html
@@ -36,105 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hamper-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync hamper-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing hamper-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced hamper-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hamper-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:gsview-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing hamper-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced hamper-overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hamper-overlay
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hamper-overlay.txt b/hamper-overlay.txt
index daf6d3635653..9fe0ab114185 100644
--- a/hamper-overlay.txt
+++ b/hamper-overlay.txt
@@ -11,50 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/hamper/hamper-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hamper-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gsview-overlay repo at '/var/lib/repo-mirror-ci/sync/gsview-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hamper-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/hamper-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hamper-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/han.html b/han.html
index 818bc5f71f42..d0ad02330079 100644
--- a/han.html
+++ b/han.html
@@ -36,105 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync han
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync han
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing han
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:flussence repo at &#x27;/var/lib/repo-mirror-ci/sync/flussence&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:gnux32 repo at &#x27;/var/lib/repo-mirror-ci/sync/gnux32&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced han
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:griffon_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/griffon_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 han
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:gsview-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing han
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced han
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 han
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/han.txt b/han.txt
index 3d16f64ebc69..676fd01319b4 100644
--- a/han.txt
+++ b/han.txt
@@ -11,50 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/hanmertens/han-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync han
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnux32 repo at '/var/lib/repo-mirror-ci/sync/gnux32', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:griffon_overlay repo at '/var/lib/repo-mirror-ci/sync/griffon_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gsview-overlay repo at '/var/lib/repo-mirror-ci/sync/gsview-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing han
-Cloning into '/var/lib/repo-mirror-ci/sync/han'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced han
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hangul-typing.html b/hangul-typing.html
index 33c66fd9894b..f3507f98c1dd 100644
--- a/hangul-typing.html
+++ b/hangul-typing.html
@@ -36,105 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hangul-typing
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync hangul-typing
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing hangul-typing
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fem-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/fem-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gentoo-mate repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-mate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced hangul-typing
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:gsview-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gsview-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hangul-typing
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:hamper-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing hangul-typing
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced hangul-typing
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hangul-typing
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hangul-typing.txt b/hangul-typing.txt
index 39dadb2954a1..7c504aa49497 100644
--- a/hangul-typing.txt
+++ b/hangul-typing.txt
@@ -11,50 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hangul-typing
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fem-overlay repo at '/var/lib/repo-mirror-ci/sync/fem-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gsview-overlay repo at '/var/lib/repo-mirror-ci/sync/gsview-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hangul-typing
-Cloning into '/var/lib/repo-mirror-ci/sync/hangul-typing'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hangul-typing
* Sync succeeded
$ git log --format=%ci -1
diff --git a/haskell.html b/haskell.html
index d0411bbc9b30..c8066ec63e8c 100644
--- a/haskell.html
+++ b/haskell.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync haskell
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync haskell
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing haskell
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced haskell
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:hamper-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haskell
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing haskell
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced haskell
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 haskell
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/haskell.txt b/haskell.txt
index 17c87f663118..10616c4b47ab 100644
--- a/haskell.txt
+++ b/haskell.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'https://github.com/gentoo-haskell/gentoo-haskell.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync haskell
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing haskell
-Cloning into '/var/lib/repo-mirror-ci/sync/haskell'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced haskell
* Sync succeeded
$ git log --format=%ci -1
diff --git a/heindsight.html b/heindsight.html
index 3eb620e70023..a1ebd51c93fa 100644
--- a/heindsight.html
+++ b/heindsight.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync heindsight
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync heindsight
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing heindsight
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:go-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/go-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced heindsight
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:hamper-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 heindsight
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing heindsight
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/heindsight&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced heindsight
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 heindsight
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/heindsight.txt b/heindsight.txt
index f9b646224cd8..46cea25d236a 100644
--- a/heindsight.txt
+++ b/heindsight.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/heindsight/gentoo_overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync heindsight
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:go-overlay repo at '/var/lib/repo-mirror-ci/sync/go-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing heindsight
-Cloning into '/var/lib/repo-mirror-ci/sync/heindsight'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced heindsight
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hering-overlay.html b/hering-overlay.html
index a0d623fbd429..63d965efb121 100644
--- a/hering-overlay.html
+++ b/hering-overlay.html
@@ -32,99 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync hering-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync hering-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing hering-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced hering-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:hamper-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hering-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:heindsight repo at &#x27;/var/lib/repo-mirror-ci/sync/heindsight&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing hering-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hering-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced hering-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hering-overlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hering-overlay.txt b/hering-overlay.txt
index 8acafc2a92d3..cb09215274ad 100644
--- a/hering-overlay.txt
+++ b/hering-overlay.txt
@@ -9,47 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/internethering/hering-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hering-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:heindsight repo at '/var/lib/repo-mirror-ci/sync/heindsight', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hering-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/hering-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hering-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hexedit-overlay.html b/hexedit-overlay.html
index 22169de18dd6..9d4ab2e67537 100644
--- a/hexedit-overlay.html
+++ b/hexedit-overlay.html
@@ -32,99 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync hexedit-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync hexedit-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing hexedit-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced hexedit-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:hamper-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/hamper-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hexedit-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:heindsight repo at &#x27;/var/lib/repo-mirror-ci/sync/heindsight&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing hexedit-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hexedit-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced hexedit-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hexedit-overlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hexedit-overlay.txt b/hexedit-overlay.txt
index 144f74e36195..c2c5c19e9142 100644
--- a/hexedit-overlay.txt
+++ b/hexedit-overlay.txt
@@ -9,47 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://git.ifproject.ru/hexedit/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hexedit-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hamper-overlay repo at '/var/lib/repo-mirror-ci/sync/hamper-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:heindsight repo at '/var/lib/repo-mirror-ci/sync/heindsight', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hexedit-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/hexedit-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hexedit-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hibiscus.html b/hibiscus.html
index 8ef291947f8e..b4fd79131b61 100644
--- a/hibiscus.html
+++ b/hibiscus.html
@@ -40,97 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync hibiscus
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync hibiscus
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing hibiscus
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:gerislay repo at &#x27;/var/lib/repo-mirror-ci/sync/gerislay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:gnustep repo at &#x27;/var/lib/repo-mirror-ci/sync/gnustep&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:goris repo at &#x27;/var/lib/repo-mirror-ci/sync/goris&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced hibiscus
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:han repo at &#x27;/var/lib/repo-mirror-ci/sync/han&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hibiscus
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:dwfreed repo at &#x27;/var/lib/repo-mirror-ci/sync/dwfreed&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:gamerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/gamerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:gentoo-zh repo at &#x27;/var/lib/repo-mirror-ci/sync/gentoo-zh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:gitlab repo at &#x27;/var/lib/repo-mirror-ci/sync/gitlab&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:gnome repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:gnome-next repo at &#x27;/var/lib/repo-mirror-ci/sync/gnome-next&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:graaff repo at &#x27;/var/lib/repo-mirror-ci/sync/graaff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:grub2-themes repo at &#x27;/var/lib/repo-mirror-ci/sync/grub2-themes&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:guru repo at &#x27;/var/lib/repo-mirror-ci/sync/guru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:haarp repo at &#x27;/var/lib/repo-mirror-ci/sync/haarp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:hangul-typing repo at &#x27;/var/lib/repo-mirror-ci/sync/hangul-typing&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:heindsight repo at &#x27;/var/lib/repo-mirror-ci/sync/heindsight&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing hibiscus
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hibiscus&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced hibiscus
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hibiscus
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hibiscus.txt b/hibiscus.txt
index d2f11f7ab32f..6f67bfa64674 100644
--- a/hibiscus.txt
+++ b/hibiscus.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/hibiscus.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hibiscus
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:han repo at '/var/lib/repo-mirror-ci/sync/han', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:dwfreed repo at '/var/lib/repo-mirror-ci/sync/dwfreed', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gamerlay repo at '/var/lib/repo-mirror-ci/sync/gamerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gentoo-zh repo at '/var/lib/repo-mirror-ci/sync/gentoo-zh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:gnome-next repo at '/var/lib/repo-mirror-ci/sync/gnome-next', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:grub2-themes repo at '/var/lib/repo-mirror-ci/sync/grub2-themes', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:guru repo at '/var/lib/repo-mirror-ci/sync/guru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haarp repo at '/var/lib/repo-mirror-ci/sync/haarp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hangul-typing repo at '/var/lib/repo-mirror-ci/sync/hangul-typing', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:heindsight repo at '/var/lib/repo-mirror-ci/sync/heindsight', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hibiscus
-Cloning into '/var/lib/repo-mirror-ci/sync/hibiscus'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hibiscus
* Sync succeeded
$ git log --format=%ci -1
diff --git a/holgersson-overlay.html b/holgersson-overlay.html
index f5fb43f53f22..8110ba80ee12 100644
--- a/holgersson-overlay.html
+++ b/holgersson-overlay.html
@@ -30,41 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync holgersson-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync holgersson-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing holgersson-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing holgersson-overlay
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;...
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced holgersson-overlay
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 holgersson-overlay
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced holgersson-overlay
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 holgersson-overlay
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt
index e7c3f1b98a06..27e3479268a0 100644
--- a/holgersson-overlay.txt
+++ b/holgersson-overlay.txt
@@ -8,18 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync holgersson-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing holgersson-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/holgersson-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced holgersson-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hossie.html b/hossie.html
index 6267d6daf434..c4198b77adce 100644
--- a/hossie.html
+++ b/hossie.html
@@ -26,41 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync hossie
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync hossie
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing hossie
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing hossie
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;...
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** synced hossie
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hossie
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced hossie
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hossie
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hossie.txt b/hossie.txt
index f857bd04d914..9bff990269bb 100644
--- a/hossie.txt
+++ b/hossie.txt
@@ -6,18 +6,23 @@
'source': [{'type': 'git',
'uri': 'https://git.hossie.de/scm/gen/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hossie
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hossie
-Cloning into '/var/lib/repo-mirror-ci/sync/hossie'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hossie
* Sync succeeded
$ git log --format=%ci -1
diff --git a/hotstoast.html b/hotstoast.html
index de1b6e42fbd1..4fc3e0613dc4 100644
--- a/hotstoast.html
+++ b/hotstoast.html
@@ -36,41 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync hotstoast
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync hotstoast
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing hotstoast
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing hotstoast
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;...
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced hotstoast
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hotstoast
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced hotstoast
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 hotstoast
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/hotstoast.txt b/hotstoast.txt
index 78bcaabe2ec5..04f3960c2ae2 100644
--- a/hotstoast.txt
+++ b/hotstoast.txt
@@ -11,18 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/TomHotston/hotstoast-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hotstoast
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing hotstoast
-Cloning into '/var/lib/repo-mirror-ci/sync/hotstoast'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced hotstoast
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ikelos.html b/ikelos.html
index 952a6e52fb5b..f15210e830f0 100644
--- a/ikelos.html
+++ b/ikelos.html
@@ -38,81 +38,91 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ikelos
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ikelos
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ikelos
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing ikelos
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;...
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced ikelos
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ikelos
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * dev-python/imdbpy-5.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ikelos
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ikelos
+</pre></td></tr>
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/imdbpy-5.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/pfp-0.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/pfp-0.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/protocol-informatics-0.02_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/protocol-informatics-0.02_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/py010parser-0.1.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/py010parser-0.1.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/pyahocorasick-1.1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pyahocorasick-1.1.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/pyannotate-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/pyannotate-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/pyfacebook-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/pyfacebook-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/pynfc-9999-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/pynfc-9999-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/pysmb-1.1.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/pysmb-1.1.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/pythonnet-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/pythonnet-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/pyxml-0.8.4-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/pyxml-0.8.4-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/repoze-debug-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/repoze-debug-1.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/repoze-debug-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/repoze-debug-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/repoze-who-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/repoze-who-2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/repoze-who-plugins-digestauth-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/repoze-who-plugins-digestauth-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/snakeviz-0.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/snakeviz-0.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/spyne-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/spyne-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/transitions-0.6.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/transitions-0.6.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-sound/mpdris2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-sound/mpdris2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-video/griffith-0.13-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-video/griffith-0.13-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/ikelos.txt b/ikelos.txt
index 1e98335715f3..cd854e6a7585 100644
--- a/ikelos.txt
+++ b/ikelos.txt
@@ -12,18 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/ikelos.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ikelos
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ikelos
-Cloning into '/var/lib/repo-mirror-ci/sync/ikelos'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ikelos
* Sync succeeded
$ git log --format=%ci -1
diff --git a/index.html b/index.html
index f0abd95a03cc..c481389e9732 100644
--- a/index.html
+++ b/index.html
@@ -139,7 +139,7 @@
</td><td>6</td><td><a href="https://github.com/Bumblebee-Project/bumblebee-gentoo/">bumblebee</a></td></tr>
<tr class="GOOD"><td><a href="buzden.html">buzden</a></td><td>all good!</td><td>2021-02-25 13:40:07 +0300
</td><td>5</td><td><a href="https://github.com/buzden/buzden-overlay">buzden</a></td></tr>
- <tr class="GOOD"><td><a href="calculate.html">calculate</a></td><td>all good!</td><td>2021-03-31 12:45:10 +0300
+ <tr class="GOOD"><td><a href="calculate.html">calculate</a></td><td>all good!</td><td>2021-03-31 15:27:19 +0300
</td><td>240</td><td><a href="http://www.calculate-linux.org">calculate</a></td></tr>
<tr class="BAD_CACHE"><td><a href="canutethegreat-overlay.html">canutethegreat-overlay</a></td><td>cache regen failed</td><td>2021-02-11 12:32:26 -0800
</td><td>4</td><td><a href="http://gentoo.canutethegreat.com/">canutethegreat-overlay</a></td></tr>
@@ -261,8 +261,8 @@
</td><td>4</td><td><a href="https://github.com/rafaelmartins/flightsim-overlay">flightsim</a></td></tr>
<tr class="GOOD"><td><a href="floppym.html">floppym</a></td><td>all good!</td><td>2021-01-11 17:41:02 -0500
</td><td>4</td><td><a href="https://github.com/floppym/floppym">floppym</a></td></tr>
- <tr class="GOOD"><td><a href="flow.html">flow</a></td><td>all good!</td><td>2021-03-26 18:36:07 +0100
-</td><td>101</td><td><a href="https://gitlab.com/Flow/flow-s-ebuilds">flow</a></td></tr>
+ <tr class="GOOD"><td><a href="flow.html">flow</a></td><td>all good!</td><td>2021-03-31 15:05:56 +0200
+</td><td>102</td><td><a href="https://gitlab.com/Flow/flow-s-ebuilds">flow</a></td></tr>
<tr class="GOOD"><td><a href="flussence.html">flussence</a></td><td>all good!</td><td>2021-03-28 05:58:14 +0100
</td><td>49</td><td><a href="https://repo.or.cz/flussence-overlay.git">flussence</a></td></tr>
<tr class="GOOD"><td><a href="fol4.html">fol4</a></td><td>all good!</td><td>2021-03-25 11:38:33 +0100
@@ -291,8 +291,8 @@
</td><td>8</td><td><a href="https://github.com/gcarq/gcarq-overlay">gcarq</a></td></tr>
<tr class="BAD_CACHE"><td><a href="genthree.html">genthree</a></td><td>cache regen failed</td><td>2020-04-18 16:27:50 +0200
</td><td>44</td><td><a href="https://genthree.io/overlay">genthree</a></td></tr>
- <tr class="GOOD"><td><a href="gentoo.html">gentoo</a></td><td>all good!</td><td>2021-03-31 13:54:02 +0200
-</td><td>29149</td><td><a href="https://gentoo.org/">gentoo</a></td></tr>
+ <tr class="GOOD"><td><a href="gentoo.html">gentoo</a></td><td>all good!</td><td>2021-03-31 15:06:43 +0200
+</td><td>29148</td><td><a href="https://gentoo.org/">gentoo</a></td></tr>
<tr class="GOOD"><td><a href="gentoo-bootstrap.html">gentoo-bootstrap</a></td><td>all good!</td><td>2020-11-13 21:17:12 +0000
</td><td>48</td><td><a href="https://gitlab.com/stikonas/gentoo-bootstrap">gentoo-bootstrap</a></td></tr>
<tr class="GOOD"><td><a href="gentoo-clang.html">gentoo-clang</a></td><td>all good!</td><td>2020-05-29 09:13:01 +0200
@@ -828,7 +828,7 @@
</table>
- <address>Generated based on results from 2021-03-31 12:52:49 UTC</address>
+ <address>Generated based on results from 2021-03-31 13:22:11 UTC</address>
</body>
</html>
\ No newline at end of file
diff --git a/ixit.html b/ixit.html
index 6608a084bd08..176a5173dc4a 100644
--- a/ixit.html
+++ b/ixit.html
@@ -34,43 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync ixit
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ixit
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing ixit
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing ixit
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;...
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced ixit
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced ixit
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ixit
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ixit.txt b/ixit.txt
index cff1f5457444..e18aa0842dd7 100644
--- a/ixit.txt
+++ b/ixit.txt
@@ -10,19 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/okias/ixit.git'},
{'type': 'git', 'uri': 'git@github.com:okias/ixit.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ixit
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ixit
-Cloning into '/var/lib/repo-mirror-ci/sync/ixit'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ixit
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jacendi-overlay.html b/jacendi-overlay.html
index c03b8c346733..45a27b2d9119 100644
--- a/jacendi-overlay.html
+++ b/jacendi-overlay.html
@@ -32,43 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync jacendi-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync jacendi-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing jacendi-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing jacendi-overlay
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;...
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced jacendi-overlay
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jacendi-overlay
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced jacendi-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jacendi-overlay
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jacendi-overlay.txt b/jacendi-overlay.txt
index c1d33f4fc4fa..dc1d8f5c50e8 100644
--- a/jacendi-overlay.txt
+++ b/jacendi-overlay.txt
@@ -9,19 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://bitbucket.org/jacendi/jacendi-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jacendi-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jacendi-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/jacendi-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jacendi-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jamesbroadhead.html b/jamesbroadhead.html
index f8a608b0c159..261478282978 100644
--- a/jamesbroadhead.html
+++ b/jamesbroadhead.html
@@ -42,43 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync jamesbroadhead
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync jamesbroadhead
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing jamesbroadhead
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing jamesbroadhead
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;...
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced jamesbroadhead
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced jamesbroadhead
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jamesbroadhead
+</pre></td></tr>
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jamesbroadhead.txt b/jamesbroadhead.txt
index e689aeb11f31..cab650fd32b6 100644
--- a/jamesbroadhead.txt
+++ b/jamesbroadhead.txt
@@ -14,19 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/jamesbroadhead.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jamesbroadhead
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jamesbroadhead
-Cloning into '/var/lib/repo-mirror-ci/sync/jamesbroadhead'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jamesbroadhead
* Sync succeeded
$ git log --format=%ci -1
diff --git a/java.html b/java.html
index 71c39bb368b9..06c8adfeb307 100644
--- a/java.html
+++ b/java.html
@@ -38,53 +38,57 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync java
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync java
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing java
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing java
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;...
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced java
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced java
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 java
+</pre></td></tr>
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/antlr-python-3.1.3-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * games-action/minecraft-1.2.1-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-sound/tuxguitar-1.1-r1: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/java.txt b/java.txt
index 8f9bfeba095d..aa43421dc8ec 100644
--- a/java.txt
+++ b/java.txt
@@ -12,21 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/java.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync java
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing java
-Cloning into '/var/lib/repo-mirror-ci/sync/java'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced java
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jboro-overlay.html b/jboro-overlay.html
index 38c656ad1e65..05e16de36cf4 100644
--- a/jboro-overlay.html
+++ b/jboro-overlay.html
@@ -28,47 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync jboro-overlay
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync jboro-overlay
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing jboro-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing jboro-overlay
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;...
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced jboro-overlay
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jboro-overlay
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jboro-overlay
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jboro-overlay.txt b/jboro-overlay.txt
index 0cce1c0be7d3..51b0d1f48269 100644
--- a/jboro-overlay.txt
+++ b/jboro-overlay.txt
@@ -7,21 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/JBoro/portage.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jboro-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jboro-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/jboro-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jboro-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jkolo.html b/jkolo.html
index 2d5ea26ab751..4921631bfe9c 100644
--- a/jkolo.html
+++ b/jkolo.html
@@ -30,285 +30,55 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync jkolo
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync jkolo
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing jkolo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing jkolo
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;...
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** synced jkolo
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f8c0cefd280&gt;
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jkolo
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Traceback (most recent call last):
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> self.ebp.disable_eclass_caching()
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;23118&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;23118&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;23118&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;23118&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;23118&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f8c0d5e84c0&gt;
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;23118&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/jkolo.txt b/jkolo.txt
index 9b8f8d3a4d2f..a4544191991a 100644
--- a/jkolo.txt
+++ b/jkolo.txt
@@ -8,143 +8,28 @@
'source': [{'type': 'git',
'uri': 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jkolo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jkolo
-Cloning into '/var/lib/repo-mirror-ci/sync/jkolo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jkolo
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f8c0cefd280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '23118' appears dead, timing out
* app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '23118' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '23118' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '23118' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '23118' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f8c0d5e84c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '23118' appears dead, timing out
* Cache regen failed with 1
diff --git a/jm-overlay.html b/jm-overlay.html
index c9cde7ab2e3b..cda4da6b2a9f 100644
--- a/jm-overlay.html
+++ b/jm-overlay.html
@@ -30,49 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync jm-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync jm-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing jm-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing jm-overlay
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jm-overlay&#x27;...
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced jm-overlay
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced jm-overlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jm-overlay.txt b/jm-overlay.txt
index 0e8d50a3f0ba..9b91df4e5b68 100644
--- a/jm-overlay.txt
+++ b/jm-overlay.txt
@@ -8,22 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/Jannis234/jm-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jm-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jm-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/jm-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jm-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jmbsvicetto.html b/jmbsvicetto.html
index b93fefa4631f..0ec63185bf0d 100644
--- a/jmbsvicetto.html
+++ b/jmbsvicetto.html
@@ -40,65 +40,59 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync jmbsvicetto
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync jmbsvicetto
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jmbsvicetto
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jmbsvicetto
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** syncing jmbsvicetto
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;...
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced jmbsvicetto
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
-</pre></td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-backup/bacula-9.0.8: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-backup/bacula-9.0.8: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-backup/bacula-9.2.1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-backup/bacula-9.2.1: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-misc/gramps-3.4.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/gramps-3.4.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-misc/gramps-4.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-misc/gramps-4.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/jmbsvicetto.txt b/jmbsvicetto.txt
index 84dde3fda817..6822f0160ffa 100644
--- a/jmbsvicetto.txt
+++ b/jmbsvicetto.txt
@@ -13,26 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync jmbsvicetto
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jmbsvicetto
-Cloning into '/var/lib/repo-mirror-ci/sync/jmbsvicetto'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jmbsvicetto
* Sync succeeded
$ git log --format=%ci -1
diff --git a/johnmh.html b/johnmh.html
index debac75a4f86..dc6273ce20aa 100644
--- a/johnmh.html
+++ b/johnmh.html
@@ -38,193 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync johnmh
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync johnmh
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing johnmh
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing johnmh
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/johnmh&#x27;...
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced johnmh
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johnmh
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f304c89d280&gt;
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;12065&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;12065&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;12065&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;12065&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f304cf884c0&gt;
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;12065&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/johnmh.txt b/johnmh.txt
index 1af2754af042..36519c6c4f34 100644
--- a/johnmh.txt
+++ b/johnmh.txt
@@ -12,97 +12,26 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/johnmh.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync johnmh
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing johnmh
-Cloning into '/var/lib/repo-mirror-ci/sync/johnmh'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced johnmh
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johnmh
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f304c89d280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '12065' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '12065' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '12065' appears dead, timing out
-ERROR pkgcore: ebp for pid '12065' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f304cf884c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '12065' appears dead, timing out
* Cache regenerated successfully
diff --git a/johu.html b/johu.html
index 5cf0b6848671..78224ba89980 100644
--- a/johu.html
+++ b/johu.html
@@ -38,41 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync johu
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync johu
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing johu
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing johu
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;...
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced johu
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced johu
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 johu
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/johu.txt b/johu.txt
index 6a5c369cfa94..92d7bf769b3d 100644
--- a/johu.txt
+++ b/johu.txt
@@ -12,18 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/johu.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync johu
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing johu
-Cloning into '/var/lib/repo-mirror-ci/sync/johu'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced johu
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jorgicio.html b/jorgicio.html
index 8583d5886bfa..dfdb4031f5e7 100644
--- a/jorgicio.html
+++ b/jorgicio.html
@@ -40,67 +40,73 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync jorgicio
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync jorgicio
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing jorgicio
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** syncing jorgicio
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;...
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced jorgicio
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced jorgicio
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jorgicio
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jorgicio
+</pre></td></tr>
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/HTML-0.04: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/pushbullet-commons-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-gfx/noteshrink-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-gfx/noteshrink-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * media-gfx/noteshrink-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * media-tv/xawtv-3.107: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-misc/mininet-2.2.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * net-wireless/kickthemout-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * sci-astronomy/eht-imaging-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * sci-astronomy/eht-imaging-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * x11-misc/glipper-2.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/jorgicio.txt b/jorgicio.txt
index bd8a42d74c16..b1d65df77343 100644
--- a/jorgicio.txt
+++ b/jorgicio.txt
@@ -13,20 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:jorgicio/jorgicio-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jorgicio
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jorgicio
-Cloning into '/var/lib/repo-mirror-ci/sync/jorgicio'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jorgicio
* Sync succeeded
$ git log --format=%ci -1
diff --git a/jsteward.html b/jsteward.html
index 42c37b72bf5e..322017a5e657 100644
--- a/jsteward.html
+++ b/jsteward.html
@@ -36,63 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync jsteward
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync jsteward
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing jsteward
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced jsteward
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** syncing jsteward
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jsteward
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/jsteward&#x27;...
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced jsteward
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jsteward
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/jsteward.txt b/jsteward.txt
index a53b043461fd..e385d15f8aa8 100644
--- a/jsteward.txt
+++ b/jsteward.txt
@@ -11,29 +11,23 @@
{'type': 'git', 'uri': 'git://github.com/KireinaHoro/jsteward.git'},
{'type': 'git', 'uri': 'git@github.com:KireinaHoro/jsteward.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync jsteward
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing jsteward
-Cloning into '/var/lib/repo-mirror-ci/sync/jsteward'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced jsteward
* Sync succeeded
$ git log --format=%ci -1
diff --git a/junkdrawer.html b/junkdrawer.html
index 3476e1208077..4cdf63cc3703 100644
--- a/junkdrawer.html
+++ b/junkdrawer.html
@@ -32,185 +32,187 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync junkdrawer
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync junkdrawer
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing junkdrawer
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing junkdrawer
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;...
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced junkdrawer
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced junkdrawer
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-vim/easytags-3.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 junkdrawer
+</pre></td></tr>
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-vim/easytags-3.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/NativeImaging-0.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/NativeImaging-0.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/astroid-1.6.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/astroid-1.6.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/cornice-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/cornice-1.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/cornice-2.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/cornice-2.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/cornice-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/cornice-2.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/cornice-2.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/cornice-2.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/cornice-2.3.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/cornice-2.3.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/cornice-2.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/cornice-2.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/cornice-3.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/cornice-3.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/cornice-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/cornice-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/cornice-3.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/cornice-3.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/cssselect-1.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/cssselect-1.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/cssselect-1.0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/cssselect-1.0.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/flask-caching-1.3.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/flask-caching-1.3.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/flask-caching-1.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/flask-caching-1.4.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/graphite-api-1.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/graphite-api-1.1.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/graphviz-0.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/graphviz-0.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/graphviz-0.8.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/graphviz-0.8.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/graphviz-0.8.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/graphviz-0.8.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/hawkauthlib-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/hawkauthlib-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/hawkauthlib-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/hawkauthlib-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/konfig-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/konfig-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/konfig-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/konfig-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/libzfs-python-0_p20170717: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/libzfs-python-0_p20170717: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/libzfs-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/libzfs-python-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/livereload-2.5.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/livereload-2.5.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/livereload-2.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/livereload-2.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/mozsvc-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/mozsvc-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/mozsvc-0.8_p20141211: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/mozsvc-0.8_p20141211: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/mozsvc-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/mozsvc-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/mozsvc-0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/mozsvc-0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/nvidia-ml-py3-7.352.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/nvidia-ml-py3-7.352.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/pybindxml-0.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-python/pybindxml-0.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-python/pybrowserid-0.10.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-python/pybrowserid-0.10.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-python/pybrowserid-0.11.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-python/pybrowserid-0.11.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-python/pybrowserid-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-python/pybrowserid-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-python/pybrowserid-0.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-python/pybrowserid-0.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-python/pybrowserid-0.14.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-python/pybrowserid-0.14.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-python/pyramid_hawkauth-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-python/pyramid_hawkauth-0.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-python/pyramid_hawkauth-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-python/pyramid_hawkauth-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-python/pyseeder-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-python/pyseeder-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-python/pysoundfile-0.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-python/pysoundfile-0.8.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-python/pysoundfile-0.9.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-python/pysoundfile-0.9.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-python/pysoundfile-0.10.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-python/pysoundfile-0.10.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-python/pysoundfile-0.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-python/pysoundfile-0.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-python/pytest-pylint-0.9.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-python/pytest-pylint-0.9.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-python/pytest-pylint-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-python/pytest-pylint-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-python/python-iptables-0.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * dev-python/python-iptables-0.13.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * dev-python/rfc3339-5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * dev-python/rfc3339-5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * dev-python/rfc3339-6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * dev-python/rfc3339-6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * dev-python/sdnotify-0.3.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * dev-python/sdnotify-0.3.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * dev-python/solrpy-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * dev-python/solrpy-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * dev-python/spake2-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * dev-python/spake2-0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * dev-python/tokenlib-0.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * dev-python/tokenlib-0.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * dev-python/tokenlib-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * dev-python/tokenlib-2.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * dev-python/tokenserver-1.2.20: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * dev-python/tokenserver-1.2.20: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * dev-python/tokenserver-1.2.21: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * dev-python/tokenserver-1.2.21: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * dev-python/tokenserver-1.2.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * dev-python/tokenserver-1.2.22: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * dev-python/tokenserver-1.2.23: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * dev-python/tokenserver-1.2.23: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * dev-python/tokenserver-1.2.26: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * dev-python/tokenserver-1.2.26: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * dev-python/tokenserver-1.2.27: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * dev-python/tokenserver-1.2.27: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * dev-python/tokenserver-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * dev-python/tokenserver-1.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * dev-python/webtest-2.0.30: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * dev-python/webtest-2.0.30: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * dev-python/worldcat-0.3.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * dev-python/worldcat-0.3.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * net-wireless/pyrtlsdr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * net-wireless/pyrtlsdr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * sys-cluster/pyslurm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * sys-cluster/pyslurm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/junkdrawer.txt b/junkdrawer.txt
index dde42cb8a79b..966708aa8aa5 100644
--- a/junkdrawer.txt
+++ b/junkdrawer.txt
@@ -9,22 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/doctaweeks/junkdrawer-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync junkdrawer
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing junkdrawer
-Cloning into '/var/lib/repo-mirror-ci/sync/junkdrawer'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced junkdrawer
* Sync succeeded
$ git log --format=%ci -1
diff --git a/kaa.html b/kaa.html
index 720627e619f5..666a1b6dcccf 100644
--- a/kaa.html
+++ b/kaa.html
@@ -30,39 +30,39 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync kaa
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync kaa
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing kaa
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing kaa
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;...
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
<tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced kaa
</pre></td></tr>
diff --git a/kaa.txt b/kaa.txt
index 81ec5b89ae87..642859c1bd30 100644
--- a/kaa.txt
+++ b/kaa.txt
@@ -8,23 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/Oleh-Kravchenko/kaa-layman.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync kaa
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing kaa
-Cloning into '/var/lib/repo-mirror-ci/sync/kaa'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced kaa
* Sync succeeded
$ git log --format=%ci -1
diff --git a/kde.html b/kde.html
index e463c41e8260..2bf6309d59e2 100644
--- a/kde.html
+++ b/kde.html
@@ -36,39 +36,39 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync kde
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync kde
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing kde
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** syncing kde
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;...
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
<tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced kde
</pre></td></tr>
diff --git a/kde.txt b/kde.txt
index c74b4d53f5a4..74246a8b21bd 100644
--- a/kde.txt
+++ b/kde.txt
@@ -11,23 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/kde.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync kde
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing kde
-Cloning into '/var/lib/repo-mirror-ci/sync/kde'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced kde
* Sync succeeded
$ git log --format=%ci -1
diff --git a/keepbot-overlay.html b/keepbot-overlay.html
index d53787c13d7b..7a627d489965 100644
--- a/keepbot-overlay.html
+++ b/keepbot-overlay.html
@@ -36,73 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync keepbot-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync keepbot-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing keepbot-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced keepbot-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:johnmh repo at &#x27;/var/lib/repo-mirror-ci/sync/johnmh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:junkdrawer repo at &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kaa repo at &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing keepbot-overlay
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/keepbot-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced keepbot-overlay
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 keepbot-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/keepbot-overlay.txt b/keepbot-overlay.txt
index f3079dbc9def..00289e7cffbe 100644
--- a/keepbot-overlay.txt
+++ b/keepbot-overlay.txt
@@ -11,34 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync keepbot-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johnmh repo at '/var/lib/repo-mirror-ci/sync/johnmh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:junkdrawer repo at '/var/lib/repo-mirror-ci/sync/junkdrawer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kaa repo at '/var/lib/repo-mirror-ci/sync/kaa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing keepbot-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/keepbot-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced keepbot-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/khoverlay.html b/khoverlay.html
index ae7a8dd1f550..97a83feb78c5 100644
--- a/khoverlay.html
+++ b/khoverlay.html
@@ -34,59 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync khoverlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync khoverlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing khoverlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced khoverlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** syncing khoverlay
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/khoverlay&#x27;...
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced khoverlay
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 khoverlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 khoverlay
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/khoverlay.txt b/khoverlay.txt
index 7a36ef489384..62d1400ba9e8 100644
--- a/khoverlay.txt
+++ b/khoverlay.txt
@@ -10,27 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/khumba/khoverlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync khoverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing khoverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/khoverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced khoverlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/klondike.html b/klondike.html
index 9661a907c06c..5c87cef04830 100644
--- a/klondike.html
+++ b/klondike.html
@@ -42,309 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync klondike
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync klondike
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing klondike
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced klondike
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:junkdrawer repo at &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 klondike
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kaa repo at &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing klondike
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;...
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced klondike
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 klondike
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f07cc7b5280&gt;
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27739&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * media-fonts/ttf-fifthhorseman-dkg-handwriting-0.15: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-fonts/ttf-fifthhorseman-dkg-handwriting-0.15: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27739&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27739&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;27739&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27739&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f07ccea04c0&gt;
-</pre></td></tr>
- <tr class="" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l161"><td><a href="#l161"><span>161</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l162"><td><a href="#l162"><span>162</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l163"><td><a href="#l163"><span>163</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l164"><td><a href="#l164"><span>164</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l165"><td><a href="#l165"><span>165</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l166"><td><a href="#l166"><span>166</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l167"><td><a href="#l167"><span>167</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27739&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l168"><td><a href="#l168"><span>168</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/klondike.txt b/klondike.txt
index 64229e5c7a87..87a06b6b4f1b 100644
--- a/klondike.txt
+++ b/klondike.txt
@@ -14,155 +14,27 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/klondike.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync klondike
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:junkdrawer repo at '/var/lib/repo-mirror-ci/sync/junkdrawer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kaa repo at '/var/lib/repo-mirror-ci/sync/kaa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing klondike
-Cloning into '/var/lib/repo-mirror-ci/sync/klondike'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced klondike
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 klondike
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f07cc7b5280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27739' appears dead, timing out
* media-fonts/ttf-fifthhorseman-dkg-handwriting-0.15: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27739' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27739' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '27739' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27739' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f07ccea04c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27739' appears dead, timing out
* Cache regen failed with 1
diff --git a/konsolebox.html b/konsolebox.html
index d3bd99f85491..b49f5b8b287f 100644
--- a/konsolebox.html
+++ b/konsolebox.html
@@ -32,59 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync konsolebox
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync konsolebox
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing konsolebox
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced konsolebox
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing konsolebox
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/konsolebox&#x27;...
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced konsolebox
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 konsolebox
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/konsolebox.txt b/konsolebox.txt
index 657e1130621e..6fd6b8671d3f 100644
--- a/konsolebox.txt
+++ b/konsolebox.txt
@@ -9,27 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/konsolebox/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync konsolebox
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing konsolebox
-Cloning into '/var/lib/repo-mirror-ci/sync/konsolebox'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced konsolebox
* Sync succeeded
$ git log --format=%ci -1
diff --git a/kripton-overlay.html b/kripton-overlay.html
index 5c81c90b06c4..0c14f7cf5763 100644
--- a/kripton-overlay.html
+++ b/kripton-overlay.html
@@ -38,57 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync kripton-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync kripton-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing kripton-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced kripton-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** syncing kripton-overlay
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/kripton-overlay&#x27;...
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced kripton-overlay
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kripton-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kripton-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/kripton-overlay.txt b/kripton-overlay.txt
index 88911163dba6..fe00b252681e 100644
--- a/kripton-overlay.txt
+++ b/kripton-overlay.txt
@@ -12,26 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/kripton/kripton-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync kripton-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing kripton-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/kripton-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced kripton-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/kske.html b/kske.html
index 3b5b0e6c04a5..932fbfb738b4 100644
--- a/kske.html
+++ b/kske.html
@@ -34,89 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync kske
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync kske
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing kske
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced kske
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jm-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jm-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kske
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:johnmh repo at &#x27;/var/lib/repo-mirror-ci/sync/johnmh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jsteward repo at &#x27;/var/lib/repo-mirror-ci/sync/jsteward&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:junkdrawer repo at &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kaa repo at &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:keepbot-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/keepbot-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:khoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/khoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:konsolebox repo at &#x27;/var/lib/repo-mirror-ci/sync/konsolebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:kripton-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/kripton-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing kske
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced kske
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 kske
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/kske.txt b/kske.txt
index d3b66763692e..60e37ed94078 100644
--- a/kske.txt
+++ b/kske.txt
@@ -10,42 +10,23 @@
{'type': 'git',
'uri': 'ssh://git@git.kske.dev:420/kske/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync kske
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jm-overlay repo at '/var/lib/repo-mirror-ci/sync/jm-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johnmh repo at '/var/lib/repo-mirror-ci/sync/johnmh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jsteward repo at '/var/lib/repo-mirror-ci/sync/jsteward', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:junkdrawer repo at '/var/lib/repo-mirror-ci/sync/junkdrawer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kaa repo at '/var/lib/repo-mirror-ci/sync/kaa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:keepbot-overlay repo at '/var/lib/repo-mirror-ci/sync/keepbot-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:khoverlay repo at '/var/lib/repo-mirror-ci/sync/khoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:konsolebox repo at '/var/lib/repo-mirror-ci/sync/konsolebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kripton-overlay repo at '/var/lib/repo-mirror-ci/sync/kripton-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing kske
-Cloning into '/var/lib/repo-mirror-ci/sync/kske'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced kske
* Sync succeeded
$ git log --format=%ci -1
diff --git a/lanodanOverlay.html b/lanodanOverlay.html
index 808621c4a0c0..0fcf70c8476f 100644
--- a/lanodanOverlay.html
+++ b/lanodanOverlay.html
@@ -42,95 +42,57 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync lanodanOverlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync lanodanOverlay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing lanodanOverlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced lanodanOverlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jm-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jm-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lanodanOverlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:johnmh repo at &#x27;/var/lib/repo-mirror-ci/sync/johnmh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jsteward repo at &#x27;/var/lib/repo-mirror-ci/sync/jsteward&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:junkdrawer repo at &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kaa repo at &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:keepbot-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/keepbot-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:khoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/khoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:konsolebox repo at &#x27;/var/lib/repo-mirror-ci/sync/konsolebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:kripton-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/kripton-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing lanodanOverlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced lanodanOverlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lanodanOverlay
-</pre></td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * media-fonts/3270font-2.0.0: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-fonts/3270font-2.0.0: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * media-fonts/inria-fonts-1.200: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-fonts/inria-fonts-1.200: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * media-fonts/opendyslexic-20160623: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * media-fonts/opendyslexic-20160623: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt
index f31f297d3570..e1a85b57ef87 100644
--- a/lanodanOverlay.txt
+++ b/lanodanOverlay.txt
@@ -14,42 +14,23 @@
{'type': 'git', 'uri': 'git://hacktivis.me/git/overlay.git'},
{'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync lanodanOverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jm-overlay repo at '/var/lib/repo-mirror-ci/sync/jm-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johnmh repo at '/var/lib/repo-mirror-ci/sync/johnmh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jsteward repo at '/var/lib/repo-mirror-ci/sync/jsteward', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:junkdrawer repo at '/var/lib/repo-mirror-ci/sync/junkdrawer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kaa repo at '/var/lib/repo-mirror-ci/sync/kaa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:keepbot-overlay repo at '/var/lib/repo-mirror-ci/sync/keepbot-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:khoverlay repo at '/var/lib/repo-mirror-ci/sync/khoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:konsolebox repo at '/var/lib/repo-mirror-ci/sync/konsolebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kripton-overlay repo at '/var/lib/repo-mirror-ci/sync/kripton-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing lanodanOverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced lanodanOverlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/laurentb.html b/laurentb.html
index c3504d6ee898..1e2c4233f2bb 100644
--- a/laurentb.html
+++ b/laurentb.html
@@ -36,133 +36,95 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync laurentb
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync laurentb
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing laurentb
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:hotstoast repo at &#x27;/var/lib/repo-mirror-ci/sync/hotstoast&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ixit repo at &#x27;/var/lib/repo-mirror-ci/sync/ixit&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced laurentb
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:jboro-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jboro-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:jm-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jm-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 laurentb
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:johnmh repo at &#x27;/var/lib/repo-mirror-ci/sync/johnmh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:jsteward repo at &#x27;/var/lib/repo-mirror-ci/sync/jsteward&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:junkdrawer repo at &#x27;/var/lib/repo-mirror-ci/sync/junkdrawer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kaa repo at &#x27;/var/lib/repo-mirror-ci/sync/kaa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:keepbot-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/keepbot-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:khoverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/khoverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:konsolebox repo at &#x27;/var/lib/repo-mirror-ci/sync/konsolebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:kripton-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/kripton-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing laurentb
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/laurentb&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced laurentb
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 laurentb
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-arch/dtrx-7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-arch/dtrx-7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-misc/mat-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-misc/mat-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-office/icalfilter-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-office/icalfilter-0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-text/dictator-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/dictator-0.9.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-text/hyde-0.8.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-text/hyde-0.8.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/fabtools-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/fabtools-0.20.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/gearman-2.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/gearman-2.0.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/gfbi_core-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/gfbi_core-0.5.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/pyfeed-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/pyfeed-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/pythonwhois-2.4.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/pythonwhois-2.4.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/unicode-nazi-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/unicode-nazi-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/urwid_satext-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/urwid_satext-0.6.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-python/wokkel-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/wokkel-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-python/xe-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/xe-0.7.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-vcs/git-goggles-0.2.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-vcs/git-goggles-0.2.12: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-vcs/gitbuster-2.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-vcs/gitbuster-2.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * media-sound/brutha-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * media-sound/brutha-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * media-sound/dnuos-1.0.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * media-sound/dnuos-1.0.11-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-misc/rtorrent-notify-1.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/rtorrent-notify-1.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * net-wireless/blueproximity-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-wireless/blueproximity-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * sys-fs/system-storage-manager-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * sys-fs/system-storage-manager-0.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * www-apps/assnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * www-apps/assnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/laurentb.txt b/laurentb.txt
index 1ca2f844af90..ed712fb43251 100644
--- a/laurentb.txt
+++ b/laurentb.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'https://github.com/laurentb/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync laurentb
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hotstoast repo at '/var/lib/repo-mirror-ci/sync/hotstoast', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ixit repo at '/var/lib/repo-mirror-ci/sync/ixit', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jboro-overlay repo at '/var/lib/repo-mirror-ci/sync/jboro-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jm-overlay repo at '/var/lib/repo-mirror-ci/sync/jm-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johnmh repo at '/var/lib/repo-mirror-ci/sync/johnmh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jsteward repo at '/var/lib/repo-mirror-ci/sync/jsteward', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:junkdrawer repo at '/var/lib/repo-mirror-ci/sync/junkdrawer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kaa repo at '/var/lib/repo-mirror-ci/sync/kaa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:keepbot-overlay repo at '/var/lib/repo-mirror-ci/sync/keepbot-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:khoverlay repo at '/var/lib/repo-mirror-ci/sync/khoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:konsolebox repo at '/var/lib/repo-mirror-ci/sync/konsolebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kripton-overlay repo at '/var/lib/repo-mirror-ci/sync/kripton-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing laurentb
-Cloning into '/var/lib/repo-mirror-ci/sync/laurentb'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced laurentb
* Sync succeeded
$ git log --format=%ci -1
diff --git a/leechcraft.html b/leechcraft.html
index b95ddea7be29..65d47f983b31 100644
--- a/leechcraft.html
+++ b/leechcraft.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync leechcraft
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync leechcraft
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing leechcraft
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jm-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jm-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:jorgicio repo at &#x27;/var/lib/repo-mirror-ci/sync/jorgicio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced leechcraft
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:laurentb repo at &#x27;/var/lib/repo-mirror-ci/sync/laurentb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing leechcraft
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced leechcraft
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leechcraft
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/leechcraft.txt b/leechcraft.txt
index 60651cc0a407..963b42705b78 100644
--- a/leechcraft.txt
+++ b/leechcraft.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/0xd34df00d/leechcraft-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync leechcraft
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jm-overlay repo at '/var/lib/repo-mirror-ci/sync/jm-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jorgicio repo at '/var/lib/repo-mirror-ci/sync/jorgicio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:laurentb repo at '/var/lib/repo-mirror-ci/sync/laurentb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing leechcraft
-Cloning into '/var/lib/repo-mirror-ci/sync/leechcraft'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced leechcraft
* Sync succeeded
$ git log --format=%ci -1
diff --git a/leio.html b/leio.html
index fc2c93a6949a..3dd0dde1c2bd 100644
--- a/leio.html
+++ b/leio.html
@@ -38,91 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync leio
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync leio
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing leio
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced leio
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing leio
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced leio
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 leio
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-tv/kodi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/leio.txt b/leio.txt
index dd08e63ea1ac..a98a4f6cb6e1 100644
--- a/leio.txt
+++ b/leio.txt
@@ -12,42 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/leio.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync leio
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing leio
-Cloning into '/var/lib/repo-mirror-ci/sync/leio'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced leio
* Sync succeeded
$ git log --format=%ci -1
diff --git a/levenkov.html b/levenkov.html
index 507884ece38d..9d3102356345 100644
--- a/levenkov.html
+++ b/levenkov.html
@@ -38,91 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync levenkov
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync levenkov
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing levenkov
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced levenkov
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 levenkov
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing levenkov
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced levenkov
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 levenkov
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/glob2-0.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/glob2-0.4.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/levenkov.txt b/levenkov.txt
index 9b52928299d5..785e3aa3af74 100644
--- a/levenkov.txt
+++ b/levenkov.txt
@@ -12,42 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/levenkov.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync levenkov
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing levenkov
-Cloning into '/var/lib/repo-mirror-ci/sync/levenkov'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced levenkov
* Sync succeeded
$ git log --format=%ci -1
diff --git a/librepilot.html b/librepilot.html
index e8a33d7d28f5..bd4cb40d0e09 100644
--- a/librepilot.html
+++ b/librepilot.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync librepilot
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync librepilot
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing librepilot
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced librepilot
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing librepilot
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced librepilot
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/librepilot.txt b/librepilot.txt
index 3584414ffd12..d81a16653c79 100644
--- a/librepilot.txt
+++ b/librepilot.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync librepilot
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing librepilot
-Cloning into '/var/lib/repo-mirror-ci/sync/librepilot'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced librepilot
* Sync succeeded
$ git log --format=%ci -1
diff --git a/libressl.html b/libressl.html
index 25ead85a6dbb..6d406197e27e 100644
--- a/libressl.html
+++ b/libressl.html
@@ -32,89 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync libressl
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync libressl
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing libressl
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced libressl
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing libressl
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced libressl
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/libressl.txt b/libressl.txt
index f503b338f7ce..82b1efcd4dd2 100644
--- a/libressl.txt
+++ b/libressl.txt
@@ -9,42 +9,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/libressl.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync libressl
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing libressl
-Cloning into '/var/lib/repo-mirror-ci/sync/libressl'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced libressl
* Sync succeeded
$ git log --format=%ci -1
diff --git a/liftm.html b/liftm.html
index 7ef0c315b4b0..81d175df1def 100644
--- a/liftm.html
+++ b/liftm.html
@@ -34,89 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync liftm
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync liftm
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing liftm
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced liftm
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing liftm
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced liftm
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/liftm.txt b/liftm.txt
index 65b2ba694ba1..580a7e1eb595 100644
--- a/liftm.txt
+++ b/liftm.txt
@@ -10,42 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/jcaesar/liftm-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync liftm
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing liftm
-Cloning into '/var/lib/repo-mirror-ci/sync/liftm'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced liftm
* Sync succeeded
$ git log --format=%ci -1
diff --git a/linux-be.html b/linux-be.html
index 0347764c4adb..b64a7b46b9e6 100644
--- a/linux-be.html
+++ b/linux-be.html
@@ -40,241 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync linux-be
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync linux-be
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing linux-be
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced linux-be
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing linux-be
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced linux-be
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f7150545280&gt;
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27241&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27241&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27241&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;27241&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f7150c304c0&gt;
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;27241&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/linux-be.txt b/linux-be.txt
index 99ddc829a062..64781e042415 100644
--- a/linux-be.txt
+++ b/linux-be.txt
@@ -13,121 +13,26 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/linux-be/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync linux-be
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing linux-be
-Cloning into '/var/lib/repo-mirror-ci/sync/linux-be'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced linux-be
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linux-be
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f7150545280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27241' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27241' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27241' appears dead, timing out
-ERROR pkgcore: ebp for pid '27241' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f7150c304c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '27241' appears dead, timing out
* Cache regenerated successfully
diff --git a/linuxunderground-overlay.html b/linuxunderground-overlay.html
index bcba933287ca..26830f07799f 100644
--- a/linuxunderground-overlay.html
+++ b/linuxunderground-overlay.html
@@ -34,99 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync linuxunderground-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync linuxunderground-overlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing linuxunderground-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jamesbroadhead repo at &#x27;/var/lib/repo-mirror-ci/sync/jamesbroadhead&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:johu repo at &#x27;/var/lib/repo-mirror-ci/sync/johu&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kske repo at &#x27;/var/lib/repo-mirror-ci/sync/kske&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced linuxunderground-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing linuxunderground-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced linuxunderground-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linuxunderground-overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/linuxunderground-overlay.txt b/linuxunderground-overlay.txt
index eab5efa3803d..eba18bd79a85 100644
--- a/linuxunderground-overlay.txt
+++ b/linuxunderground-overlay.txt
@@ -10,47 +10,23 @@
{'type': 'git',
'uri': 'https://github.com/linuxunderground/gentoo.overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync linuxunderground-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:johu repo at '/var/lib/repo-mirror-ci/sync/johu', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kske repo at '/var/lib/repo-mirror-ci/sync/kske', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing linuxunderground-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced linuxunderground-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/linxon.html b/linxon.html
index f34f22d6b4cf..8e816952fd03 100644
--- a/linxon.html
+++ b/linxon.html
@@ -28,141 +28,99 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync linxon
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync linxon
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing linxon
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced linxon
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linxon
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing linxon
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced linxon
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 linxon
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-admin/vhost-gen-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-admin/vhost-gen-0.15: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-admin/vhost-gen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * app-admin/vhost-gen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-backup/bytterfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-backup/bytterfs-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-forensics/s3tk-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-forensics/s3tk-0.1.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-forensics/s3tk-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-forensics/s3tk-0.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-forensics/s3tk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-forensics/s3tk-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-misc/brntool-20180404: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-misc/brntool-20180404: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-misc/brntool-20180719: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-misc/brntool-20180719: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-misc/brntool-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-misc/brntool-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * app-misc/gpick-0.2.4-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-misc/gpick-0.2.4-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/Elixir-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/Elixir-0.7.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/confy-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/confy-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/twodict-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/twodict-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/twodict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/twodict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-util/pytwf-20140513: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-util/pytwf-20140513: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-util/pytwf-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-util/pytwf-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * games-misc/nrubik-20170118: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * games-misc/nrubik-20170118: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * media-video/olive-0.1.0_pre: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * media-video/olive-0.1.0_pre: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * media-video/olive-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * media-video/olive-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * net-misc/gymail-20170205: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * net-misc/gymail-20170205: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * net-misc/gymail-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-misc/gymail-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * net-misc/youtube-dl-gui-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-misc/youtube-dl-gui-0.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * net-misc/youtube-dl-gui-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-misc/youtube-dl-gui-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * x11-misc/qsudo-20180424: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * x11-misc/qsudo-20180424: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/linxon.txt b/linxon.txt
index 2b3c381912d3..aec241a1f380 100644
--- a/linxon.txt
+++ b/linxon.txt
@@ -7,44 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/linxon/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync linxon
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing linxon
-Cloning into '/var/lib/repo-mirror-ci/sync/linxon'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced linxon
* Sync succeeded
$ git log --format=%ci -1
diff --git a/lisp.html b/lisp.html
index 84010a23cbac..44b2d4e8d61d 100644
--- a/lisp.html
+++ b/lisp.html
@@ -40,95 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lisp
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync lisp
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing lisp
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:klondike repo at &#x27;/var/lib/repo-mirror-ci/sync/klondike&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:leechcraft repo at &#x27;/var/lib/repo-mirror-ci/sync/leechcraft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced lisp
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing lisp
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced lisp
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lisp
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/lisp.txt b/lisp.txt
index b384d99d6e2b..e23e631fd04f 100644
--- a/lisp.txt
+++ b/lisp.txt
@@ -13,45 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/lisp.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync lisp
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:klondike repo at '/var/lib/repo-mirror-ci/sync/klondike', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leechcraft repo at '/var/lib/repo-mirror-ci/sync/leechcraft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing lisp
-Cloning into '/var/lib/repo-mirror-ci/sync/lisp'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced lisp
* Sync succeeded
$ git log --format=%ci -1
diff --git a/lmiphay.html b/lmiphay.html
index cca02dbe77ee..7f39c244f1e8 100644
--- a/lmiphay.html
+++ b/lmiphay.html
@@ -30,99 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync lmiphay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync lmiphay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing lmiphay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced lmiphay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing lmiphay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced lmiphay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lmiphay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/lmiphay.txt b/lmiphay.txt
index 303f326aa107..304ad8de3c5f 100644
--- a/lmiphay.txt
+++ b/lmiphay.txt
@@ -8,47 +8,23 @@
'source': [{'type': 'git',
'uri': 'git://anongit.gentoo.org/user/lmiphay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync lmiphay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing lmiphay
-Cloning into '/var/lib/repo-mirror-ci/sync/lmiphay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced lmiphay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/lto-overlay.html b/lto-overlay.html
index 2959a2177c76..75c89e07c5da 100644
--- a/lto-overlay.html
+++ b/lto-overlay.html
@@ -38,97 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync lto-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lto-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing lto-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced lto-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lto-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing lto-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced lto-overlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lto-overlay
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/lto-overlay.txt b/lto-overlay.txt
index d0f0c54d1225..806a9c251dc8 100644
--- a/lto-overlay.txt
+++ b/lto-overlay.txt
@@ -12,46 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:InBetweenNames/gentooLTO.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync lto-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing lto-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/lto-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced lto-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/luke-jr.html b/luke-jr.html
index 994a67945817..56e8aedf0b1e 100644
--- a/luke-jr.html
+++ b/luke-jr.html
@@ -26,99 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync luke-jr
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync luke-jr
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing luke-jr
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:holgersson-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/holgersson-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jmbsvicetto repo at &#x27;/var/lib/repo-mirror-ci/sync/jmbsvicetto&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:librepilot repo at &#x27;/var/lib/repo-mirror-ci/sync/librepilot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced luke-jr
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:liftm repo at &#x27;/var/lib/repo-mirror-ci/sync/liftm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luke-jr
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing luke-jr
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced luke-jr
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luke-jr
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/luke-jr.txt b/luke-jr.txt
index ea467e76fd4d..b368b07e9141 100644
--- a/luke-jr.txt
+++ b/luke-jr.txt
@@ -6,47 +6,23 @@
'source': [{'type': 'git',
'uri': 'https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync luke-jr
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jmbsvicetto repo at '/var/lib/repo-mirror-ci/sync/jmbsvicetto', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:librepilot repo at '/var/lib/repo-mirror-ci/sync/librepilot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:liftm repo at '/var/lib/repo-mirror-ci/sync/liftm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing luke-jr
-Cloning into '/var/lib/repo-mirror-ci/sync/luke-jr'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced luke-jr
* Sync succeeded
$ git log --format=%ci -1
diff --git a/luxifer.html b/luxifer.html
index 9d07cd5c207f..1e9ecb68a63d 100644
--- a/luxifer.html
+++ b/luxifer.html
@@ -30,97 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync luxifer
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync luxifer
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing luxifer
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:hossie repo at &#x27;/var/lib/repo-mirror-ci/sync/hossie&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ikelos repo at &#x27;/var/lib/repo-mirror-ci/sync/ikelos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced luxifer
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luxifer
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing luxifer
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced luxifer
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 luxifer
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/luxifer.txt b/luxifer.txt
index 55f79eae0f32..7b11b647b6b1 100644
--- a/luxifer.txt
+++ b/luxifer.txt
@@ -8,46 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/luxifr/olgentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync luxifer
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:hossie repo at '/var/lib/repo-mirror-ci/sync/hossie', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ikelos repo at '/var/lib/repo-mirror-ci/sync/ikelos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing luxifer
-Cloning into '/var/lib/repo-mirror-ci/sync/luxifer'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced luxifer
* Sync succeeded
$ git log --format=%ci -1
diff --git a/lxde-gtk3.html b/lxde-gtk3.html
index ce9c8ac38364..51adcd735afb 100644
--- a/lxde-gtk3.html
+++ b/lxde-gtk3.html
@@ -40,117 +40,71 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync lxde-gtk3
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync lxde-gtk3
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing lxde-gtk3
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced lxde-gtk3
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lxde-gtk3
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing lxde-gtk3
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced lxde-gtk3
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 lxde-gtk3
-</pre></td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-editors/l3afpad-0.8.18.1.10: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-editors/l3afpad-0.8.18.1.10: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-video/gnome-mpv-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-video/gnome-mpv-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * unity-base/unity-gtk-module-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * unity-base/unity-gtk-module-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * x11-libs/bamf-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * x11-libs/bamf-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * x11-libs/libfm-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * x11-libs/libfm-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * x11-libs/libfm-extra-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * x11-libs/libfm-extra-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * x11-misc/obconf-2.0.3_p20111019: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * x11-misc/obconf-2.0.3_p20111019: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * x11-misc/obconf-2.0.4: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * x11-misc/obconf-2.0.4: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * x11-misc/obconf-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * x11-misc/obconf-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/pcmanfm-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * x11-misc/pcmanfm-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/lxde-gtk3.txt b/lxde-gtk3.txt
index 5b998432c69c..365b9b15d816 100644
--- a/lxde-gtk3.txt
+++ b/lxde-gtk3.txt
@@ -13,46 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:rilian-la-te/lxde-gtk3-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync lxde-gtk3
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing lxde-gtk3
-Cloning into '/var/lib/repo-mirror-ci/sync/lxde-gtk3'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced lxde-gtk3
* Sync succeeded
$ git log --format=%ci -1
diff --git a/maekke.html b/maekke.html
index c8452ce6ec42..99c7e7aecd2a 100644
--- a/maekke.html
+++ b/maekke.html
@@ -38,97 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync maekke
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync maekke
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing maekke
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced maekke
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 maekke
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing maekke
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced maekke
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 maekke
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/maekke.txt b/maekke.txt
index 4d2cb41fa9ca..8331e91776b3 100644
--- a/maekke.txt
+++ b/maekke.txt
@@ -12,46 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/maekke.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync maekke
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing maekke
-Cloning into '/var/lib/repo-mirror-ci/sync/maekke'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced maekke
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mate-de-gentoo.html b/mate-de-gentoo.html
index ce31927a03ea..9d69bdb14b48 100644
--- a/mate-de-gentoo.html
+++ b/mate-de-gentoo.html
@@ -30,97 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync mate-de-gentoo
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync mate-de-gentoo
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing mate-de-gentoo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced mate-de-gentoo
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mate-de-gentoo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing mate-de-gentoo
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced mate-de-gentoo
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mate-de-gentoo
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mate-de-gentoo.txt b/mate-de-gentoo.txt
index bf18959fede1..8ed1f28fff83 100644
--- a/mate-de-gentoo.txt
+++ b/mate-de-gentoo.txt
@@ -8,46 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/oz123/mate-de-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync mate-de-gentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mate-de-gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/mate-de-gentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mate-de-gentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/matrix.html b/matrix.html
index a27cbcfd9e78..824f98c679ff 100644
--- a/matrix.html
+++ b/matrix.html
@@ -42,101 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync matrix
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync matrix
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing matrix
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:levenkov repo at &#x27;/var/lib/repo-mirror-ci/sync/levenkov&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced matrix
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 matrix
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing matrix
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced matrix
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 matrix
-</pre></td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-libs/sortfilterproxymodel-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-libs/sortfilterproxymodel-9999: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/matrix.txt b/matrix.txt
index 8c486cf642b7..6b557bdd557a 100644
--- a/matrix.txt
+++ b/matrix.txt
@@ -14,47 +14,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/proj/matrix.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync matrix
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:levenkov repo at '/var/lib/repo-mirror-ci/sync/levenkov', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing matrix
-Cloning into '/var/lib/repo-mirror-ci/sync/matrix'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced matrix
* Sync succeeded
$ git log --format=%ci -1
diff --git a/megacoffee.html b/megacoffee.html
index 9cbe7b688c40..1ac2d738fb23 100644
--- a/megacoffee.html
+++ b/megacoffee.html
@@ -54,97 +54,51 @@
</pre></td></tr>
<tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>$ pmaint sync megacoffee
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint sync megacoffee
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** syncing megacoffee
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced megacoffee
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 megacoffee
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** syncing megacoffee
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;...
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced megacoffee
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 megacoffee
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/megacoffee.txt b/megacoffee.txt
index 182afe090214..225dcf25d8a1 100644
--- a/megacoffee.txt
+++ b/megacoffee.txt
@@ -20,46 +20,23 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync megacoffee
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing megacoffee
-Cloning into '/var/lib/repo-mirror-ci/sync/megacoffee'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced megacoffee
* Sync succeeded
$ git log --format=%ci -1
diff --git a/menelkir.html b/menelkir.html
index e7c8fde8b357..1466adf64180 100644
--- a/menelkir.html
+++ b/menelkir.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync menelkir
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync menelkir
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing menelkir
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:linux-be repo at &#x27;/var/lib/repo-mirror-ci/sync/linux-be&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:linxon repo at &#x27;/var/lib/repo-mirror-ci/sync/linxon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced menelkir
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:lto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:luxifer repo at &#x27;/var/lib/repo-mirror-ci/sync/luxifer&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing menelkir
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced menelkir
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 menelkir
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/menelkir.txt b/menelkir.txt
index 196a0942d761..68475c2ec122 100644
--- a/menelkir.txt
+++ b/menelkir.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync menelkir
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linxon repo at '/var/lib/repo-mirror-ci/sync/linxon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lto-overlay repo at '/var/lib/repo-mirror-ci/sync/lto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luxifer repo at '/var/lib/repo-mirror-ci/sync/luxifer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing menelkir
-Cloning into '/var/lib/repo-mirror-ci/sync/menelkir'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced menelkir
* Sync succeeded
$ git log --format=%ci -1
diff --git a/metahax.html b/metahax.html
index 371133ec28de..ebaac5e1950f 100644
--- a/metahax.html
+++ b/metahax.html
@@ -32,95 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync metahax
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync metahax
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing metahax
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced metahax
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 metahax
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing metahax
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced metahax
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 metahax
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/metahax.txt b/metahax.txt
index 635e629304ca..3ea08c77f2e9 100644
--- a/metahax.txt
+++ b/metahax.txt
@@ -9,45 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/metafarion/metahax.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync metahax
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing metahax
-Cloning into '/var/lib/repo-mirror-ci/sync/metahax'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced metahax
* Sync succeeded
$ git log --format=%ci -1
diff --git a/milos-rs.html b/milos-rs.html
index 2d2e1013ca51..e5c798289b27 100644
--- a/milos-rs.html
+++ b/milos-rs.html
@@ -32,95 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync milos-rs
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync milos-rs
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing milos-rs
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced milos-rs
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 milos-rs
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing milos-rs
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced milos-rs
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 milos-rs
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/milos-rs.txt b/milos-rs.txt
index 56675255923c..64997e72ae85 100644
--- a/milos-rs.txt
+++ b/milos-rs.txt
@@ -9,45 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/milos-rs/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync milos-rs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing milos-rs
-Cloning into '/var/lib/repo-mirror-ci/sync/milos-rs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced milos-rs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/miramir.html b/miramir.html
index 818fba268663..cb65e332ffae 100644
--- a/miramir.html
+++ b/miramir.html
@@ -28,97 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync miramir
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync miramir
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing miramir
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced miramir
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing miramir
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced miramir
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 miramir
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/miramir.txt b/miramir.txt
index ad4f3738aaf3..3fceb153d9e9 100644
--- a/miramir.txt
+++ b/miramir.txt
@@ -7,46 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/miramir/miramir-layman.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync miramir
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing miramir
-Cloning into '/var/lib/repo-mirror-ci/sync/miramir'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced miramir
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mklich.html b/mklich.html
index bfd036f4c618..fe5191fc260c 100644
--- a/mklich.html
+++ b/mklich.html
@@ -38,99 +38,55 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mklich
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync mklich
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing mklich
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced mklich
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mklich
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing mklich
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced mklich
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mklich
-</pre></td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/bumpversion-0.5.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/bumpversion-0.5.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/whichcraft-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/whichcraft-0.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/mklich.txt b/mklich.txt
index ca82dcd69d22..2f523c720a40 100644
--- a/mklich.txt
+++ b/mklich.txt
@@ -12,45 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/mklich.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync mklich
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mklich
-Cloning into '/var/lib/repo-mirror-ci/sync/mklich'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mklich
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mkr-overlay.html b/mkr-overlay.html
index 5e80d9e09353..b3d4fa1c45dd 100644
--- a/mkr-overlay.html
+++ b/mkr-overlay.html
@@ -32,97 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync mkr-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync mkr-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing mkr-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jkolo repo at &#x27;/var/lib/repo-mirror-ci/sync/jkolo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:leio repo at &#x27;/var/lib/repo-mirror-ci/sync/leio&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:linuxunderground-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/linuxunderground-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lxde-gtk3 repo at &#x27;/var/lib/repo-mirror-ci/sync/lxde-gtk3&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced mkr-overlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mate-de-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/mate-de-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mkr-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing mkr-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced mkr-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mkr-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mkr-overlay.txt b/mkr-overlay.txt
index 3f0fef05f5b5..14eddad1d2ba 100644
--- a/mkr-overlay.txt
+++ b/mkr-overlay.txt
@@ -9,46 +9,23 @@
{'type': 'git', 'uri': 'git://github.com/MalakymR/mkr-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:MalakymR/mkr-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync mkr-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:linuxunderground-overlay repo at '/var/lib/repo-mirror-ci/sync/linuxunderground-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lxde-gtk3 repo at '/var/lib/repo-mirror-ci/sync/lxde-gtk3', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mate-de-gentoo repo at '/var/lib/repo-mirror-ci/sync/mate-de-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mkr-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/mkr-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mkr-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/moaxcp.html b/moaxcp.html
index 9e3b80798fba..42f7686aabf8 100644
--- a/moaxcp.html
+++ b/moaxcp.html
@@ -30,105 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync moaxcp
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync moaxcp
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing moaxcp
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced moaxcp
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moaxcp
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing moaxcp
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced moaxcp
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moaxcp
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/moaxcp.txt b/moaxcp.txt
index 10aa7c20b7b7..ad97e8efad22 100644
--- a/moaxcp.txt
+++ b/moaxcp.txt
@@ -8,50 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/moaxcp/moaxcp-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync moaxcp
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing moaxcp
-Cloning into '/var/lib/repo-mirror-ci/sync/moaxcp'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced moaxcp
* Sync succeeded
$ git log --format=%ci -1
diff --git a/moexiami.html b/moexiami.html
index 398964921cf4..a54c3ff1d96e 100644
--- a/moexiami.html
+++ b/moexiami.html
@@ -38,107 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync moexiami
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync moexiami
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing moexiami
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced moexiami
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moexiami
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** syncing moexiami
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;...
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced moexiami
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moexiami
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/moexiami.txt b/moexiami.txt
index ccb8aa465a84..18418fdf669e 100644
--- a/moexiami.txt
+++ b/moexiami.txt
@@ -12,51 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync moexiami
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing moexiami
-Cloning into '/var/lib/repo-mirror-ci/sync/moexiami'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced moexiami
* Sync succeeded
$ git log --format=%ci -1
diff --git a/moltonel.html b/moltonel.html
index 3e05edfd7c99..3a5a6e331112 100644
--- a/moltonel.html
+++ b/moltonel.html
@@ -30,105 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync moltonel
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync moltonel
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing moltonel
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced moltonel
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moltonel
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing moltonel
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced moltonel
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 moltonel
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/moltonel.txt b/moltonel.txt
index f9c7a50d7bdc..36702a79bf95 100644
--- a/moltonel.txt
+++ b/moltonel.txt
@@ -8,50 +8,23 @@
'source': [{'type': 'git',
'uri': 'git://github.com/vincentdephily/moltonel-ebuilds.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync moltonel
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing moltonel
-Cloning into '/var/lib/repo-mirror-ci/sync/moltonel'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced moltonel
* Sync succeeded
$ git log --format=%ci -1
diff --git a/monero.html b/monero.html
index 0550fef6179e..9c23c15a0ca9 100644
--- a/monero.html
+++ b/monero.html
@@ -38,107 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync monero
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync monero
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing monero
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced monero
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 monero
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** syncing monero
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;...
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced monero
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 monero
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/monero.txt b/monero.txt
index 6cde31a61f68..51240c7a4921 100644
--- a/monero.txt
+++ b/monero.txt
@@ -12,51 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/gentoo-monero/gentoo-monero.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync monero
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing monero
-Cloning into '/var/lib/repo-mirror-ci/sync/monero'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced monero
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mschiff.html b/mschiff.html
index d03a72eca1bb..e9955c2b12d4 100644
--- a/mschiff.html
+++ b/mschiff.html
@@ -38,109 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mschiff
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync mschiff
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing mschiff
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced mschiff
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mschiff
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing mschiff
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;...
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** synced mschiff
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mschiff
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mschiff.txt b/mschiff.txt
index da78c7fbc894..1229ac0e2b6c 100644
--- a/mschiff.txt
+++ b/mschiff.txt
@@ -12,52 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/mschiff.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync mschiff
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mschiff
-Cloning into '/var/lib/repo-mirror-ci/sync/mschiff'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mschiff
* Sync succeeded
$ git log --format=%ci -1
diff --git a/multilib-portage.html b/multilib-portage.html
index c8829d74dfc0..d3afabbf96b2 100644
--- a/multilib-portage.html
+++ b/multilib-portage.html
@@ -30,107 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync multilib-portage
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync multilib-portage
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing multilib-portage
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced multilib-portage
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:metahax repo at &#x27;/var/lib/repo-mirror-ci/sync/metahax&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:milos-rs repo at &#x27;/var/lib/repo-mirror-ci/sync/milos-rs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:miramir repo at &#x27;/var/lib/repo-mirror-ci/sync/miramir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 multilib-portage
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing multilib-portage
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced multilib-portage
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 multilib-portage
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/multilib-portage.txt b/multilib-portage.txt
index d39b6b497040..e32121131245 100644
--- a/multilib-portage.txt
+++ b/multilib-portage.txt
@@ -8,51 +8,23 @@
'source': [{'type': 'git',
'uri': 'git://anongit.gentoo.org/proj/multilib-portage.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync multilib-portage
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:metahax repo at '/var/lib/repo-mirror-ci/sync/metahax', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:milos-rs repo at '/var/lib/repo-mirror-ci/sync/milos-rs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:miramir repo at '/var/lib/repo-mirror-ci/sync/miramir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing multilib-portage
-Cloning into '/var/lib/repo-mirror-ci/sync/multilib-portage'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced multilib-portage
* Sync succeeded
$ git log --format=%ci -1
diff --git a/musl-clang.html b/musl-clang.html
index 698acb5d1719..82ae675bdd6f 100644
--- a/musl-clang.html
+++ b/musl-clang.html
@@ -32,103 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync musl-clang
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync musl-clang
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing musl-clang
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced musl-clang
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl-clang
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:monero repo at &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing musl-clang
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced musl-clang
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl-clang
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/musl-clang.txt b/musl-clang.txt
index 0b8898111a42..0f370e603329 100644
--- a/musl-clang.txt
+++ b/musl-clang.txt
@@ -9,49 +9,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/karlguy/musl-clang'},
{'type': 'git', 'uri': 'git://github.com/karlguy/musl-clang'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync musl-clang
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:monero repo at '/var/lib/repo-mirror-ci/sync/monero', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing musl-clang
-Cloning into '/var/lib/repo-mirror-ci/sync/musl-clang'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced musl-clang
* Sync succeeded
$ git log --format=%ci -1
diff --git a/musl.html b/musl.html
index 679f35649b79..b994eaa6246a 100644
--- a/musl.html
+++ b/musl.html
@@ -38,105 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync musl
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync musl
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing musl
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced musl
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:monero repo at &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing musl
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced musl
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 musl
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/musl.txt b/musl.txt
index 5a2c738388ef..6551829aeb9e 100644
--- a/musl.txt
+++ b/musl.txt
@@ -12,50 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/musl.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync musl
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:monero repo at '/var/lib/repo-mirror-ci/sync/monero', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing musl
-Cloning into '/var/lib/repo-mirror-ci/sync/musl'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced musl
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mv.html b/mv.html
index 58e9efec0a69..225c19dabd44 100644
--- a/mv.html
+++ b/mv.html
@@ -44,107 +44,51 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync mv
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync mv
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing mv
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:lanodanOverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/lanodanOverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:libressl repo at &#x27;/var/lib/repo-mirror-ci/sync/libressl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced mv
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mkr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/mkr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:monero repo at &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>WARNING:pkgcore:musl-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** syncing mv
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;...
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>*** synced mv
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mv.txt b/mv.txt
index dea64f639329..cee415a84caa 100644
--- a/mv.txt
+++ b/mv.txt
@@ -15,51 +15,23 @@
{'type': 'git', 'uri': 'git://anongit.gentoo.org/user/mv.git'},
{'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/mv.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync mv
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mkr-overlay repo at '/var/lib/repo-mirror-ci/sync/mkr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:monero repo at '/var/lib/repo-mirror-ci/sync/monero', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl-clang repo at '/var/lib/repo-mirror-ci/sync/musl-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mv
-Cloning into '/var/lib/repo-mirror-ci/sync/mv'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mv
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mva.html b/mva.html
index eefa7bc47b6b..e3f88718ad88 100644
--- a/mva.html
+++ b/mva.html
@@ -32,103 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync mva
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync mva
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing mva
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:matrix repo at &#x27;/var/lib/repo-mirror-ci/sync/matrix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mklich repo at &#x27;/var/lib/repo-mirror-ci/sync/mklich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:moaxcp repo at &#x27;/var/lib/repo-mirror-ci/sync/moaxcp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced mva
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:moexiami repo at &#x27;/var/lib/repo-mirror-ci/sync/moexiami&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:moltonel repo at &#x27;/var/lib/repo-mirror-ci/sync/moltonel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:monero repo at &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mva
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:musl-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing mva
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced mva
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mva
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mva.txt b/mva.txt
index 747fe3a0b778..d03748d05640 100644
--- a/mva.txt
+++ b/mva.txt
@@ -9,49 +9,23 @@
'source': [{'type': 'git', 'uri': 'https://github.com/msva/mva-overlay'},
{'type': 'git', 'uri': 'git://github.com/msva/mva-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync mva
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:matrix repo at '/var/lib/repo-mirror-ci/sync/matrix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mklich repo at '/var/lib/repo-mirror-ci/sync/mklich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moaxcp repo at '/var/lib/repo-mirror-ci/sync/moaxcp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moexiami repo at '/var/lib/repo-mirror-ci/sync/moexiami', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:moltonel repo at '/var/lib/repo-mirror-ci/sync/moltonel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:monero repo at '/var/lib/repo-mirror-ci/sync/monero', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl-clang repo at '/var/lib/repo-mirror-ci/sync/musl-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mva
-Cloning into '/var/lib/repo-mirror-ci/sync/mva'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mva
* Sync succeeded
$ git log --format=%ci -1
diff --git a/myrvolay.html b/myrvolay.html
index 25de01c71e5c..bf46818aea3e 100644
--- a/myrvolay.html
+++ b/myrvolay.html
@@ -34,95 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync myrvolay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync myrvolay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing myrvolay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:monero repo at &#x27;/var/lib/repo-mirror-ci/sync/monero&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced myrvolay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:musl-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 myrvolay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing myrvolay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced myrvolay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 myrvolay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/myrvolay.txt b/myrvolay.txt
index 93196cb0c87e..b4827c063277 100644
--- a/myrvolay.txt
+++ b/myrvolay.txt
@@ -10,45 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/myrvogna/myrvolay.git'},
{'type': 'git', 'uri': 'git@github.com:myrvogna/myrvolay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync myrvolay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:monero repo at '/var/lib/repo-mirror-ci/sync/monero', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl-clang repo at '/var/lib/repo-mirror-ci/sync/musl-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing myrvolay
-Cloning into '/var/lib/repo-mirror-ci/sync/myrvolay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced myrvolay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/mysql.html b/mysql.html
index b4ac0e396379..f05112b035f4 100644
--- a/mysql.html
+++ b/mysql.html
@@ -38,93 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync mysql
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync mysql
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing mysql
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced mysql
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:musl-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mysql
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing mysql
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced mysql
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mysql
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/mysql.txt b/mysql.txt
index fe0a24e91ad2..a89aa4bf9976 100644
--- a/mysql.txt
+++ b/mysql.txt
@@ -12,44 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/mysql.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync mysql
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl-clang repo at '/var/lib/repo-mirror-ci/sync/musl-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing mysql
-Cloning into '/var/lib/repo-mirror-ci/sync/mysql'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced mysql
* Sync succeeded
$ git log --format=%ci -1
diff --git a/natinst.html b/natinst.html
index ec6e3c832375..f8789bf30bdc 100644
--- a/natinst.html
+++ b/natinst.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync natinst
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync natinst
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing natinst
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced natinst
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 natinst
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing natinst
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced natinst
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 natinst
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/natinst.txt b/natinst.txt
index 84c36cf2585b..c98c94f4b17f 100644
--- a/natinst.txt
+++ b/natinst.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/AndrewAmmerlaan/natinst.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync natinst
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing natinst
-Cloning into '/var/lib/repo-mirror-ci/sync/natinst'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced natinst
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nelson-graca.html b/nelson-graca.html
index 27dfa1ca0dd6..fb179eab4c84 100644
--- a/nelson-graca.html
+++ b/nelson-graca.html
@@ -36,95 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nelson-graca
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync nelson-graca
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing nelson-graca
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:jacendi-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/jacendi-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:maekke repo at &#x27;/var/lib/repo-mirror-ci/sync/maekke&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:menelkir repo at &#x27;/var/lib/repo-mirror-ci/sync/menelkir&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced nelson-graca
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:musl-clang repo at &#x27;/var/lib/repo-mirror-ci/sync/musl-clang&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nelson-graca
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing nelson-graca
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced nelson-graca
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nelson-graca
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nelson-graca.txt b/nelson-graca.txt
index fb07e462dc64..2805517d0fd1 100644
--- a/nelson-graca.txt
+++ b/nelson-graca.txt
@@ -11,45 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/nelsongraca/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync nelson-graca
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:jacendi-overlay repo at '/var/lib/repo-mirror-ci/sync/jacendi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl-clang repo at '/var/lib/repo-mirror-ci/sync/musl-clang', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nelson-graca
-Cloning into '/var/lib/repo-mirror-ci/sync/nelson-graca'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nelson-graca
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nest.html b/nest.html
index 4c0056c03886..57d655c711eb 100644
--- a/nest.html
+++ b/nest.html
@@ -36,91 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nest
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync nest
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing nest
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced nest
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nest
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing nest
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced nest
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nest
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nest.txt b/nest.txt
index 1872326ee35d..f052dc695b68 100644
--- a/nest.txt
+++ b/nest.txt
@@ -11,43 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/SpiderX/portage-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync nest
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nest
-Cloning into '/var/lib/repo-mirror-ci/sync/nest'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nest
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nico.html b/nico.html
index 7b82e44c544c..46870b8a04f3 100644
--- a/nico.html
+++ b/nico.html
@@ -38,89 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync nico
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync nico
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing nico
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced nico
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nico
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing nico
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced nico
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nico
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nico.txt b/nico.txt
index d123a9e9a3b9..6f2f1bad198e 100644
--- a/nico.txt
+++ b/nico.txt
@@ -12,42 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/nico.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync nico
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nico
-Cloning into '/var/lib/repo-mirror-ci/sync/nico'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nico
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nitratesky.html b/nitratesky.html
index 739d710a0013..572d931ea141 100644
--- a/nitratesky.html
+++ b/nitratesky.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync nitratesky
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync nitratesky
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing nitratesky
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced nitratesky
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nitratesky
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing nitratesky
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced nitratesky
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nitratesky
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nitratesky.txt b/nitratesky.txt
index e8e00578b846..9c892fc5b90b 100644
--- a/nitratesky.txt
+++ b/nitratesky.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/VTimofeenko/nitratesky.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync nitratesky
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nitratesky
-Cloning into '/var/lib/repo-mirror-ci/sync/nitratesky'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nitratesky
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nix-guix.html b/nix-guix.html
index 7de049217cc4..2bff96d00b6d 100644
--- a/nix-guix.html
+++ b/nix-guix.html
@@ -32,91 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync nix-guix
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync nix-guix
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing nix-guix
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lisp repo at &#x27;/var/lib/repo-mirror-ci/sync/lisp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced nix-guix
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nix-guix
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing nix-guix
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced nix-guix
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nix-guix
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nix-guix.txt b/nix-guix.txt
index 0f96f46ad19b..a689e8437e96 100644
--- a/nix-guix.txt
+++ b/nix-guix.txt
@@ -9,43 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/trofi/nix-guix-gentoo.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync nix-guix
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nix-guix
-Cloning into '/var/lib/repo-mirror-ci/sync/nix-guix'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nix-guix
* Sync succeeded
$ git log --format=%ci -1
diff --git a/np-hardass-overlay.html b/np-hardass-overlay.html
index 6ac298a8964f..bfbaab45ece9 100644
--- a/np-hardass-overlay.html
+++ b/np-hardass-overlay.html
@@ -30,101 +30,61 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync np-hardass-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync np-hardass-overlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing np-hardass-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced np-hardass-overlay
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 np-hardass-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing np-hardass-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced np-hardass-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 np-hardass-overlay
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/pyshorteners-0.3.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * dev-python/pyshorteners-0.3.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/pyshorteners-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * dev-python/pyshorteners-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-sound/bandcamp-dl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-sound/bandcamp-dl-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-sound/pithos-1.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-sound/pithos-1.5.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * media-sound/pithos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-sound/pithos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/np-hardass-overlay.txt b/np-hardass-overlay.txt
index b278aaf82834..eccf8ff3df66 100644
--- a/np-hardass-overlay.txt
+++ b/np-hardass-overlay.txt
@@ -8,43 +8,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/np-hardass/np-hardass-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync np-hardass-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing np-hardass-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/np-hardass-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced np-hardass-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nx.html b/nx.html
index 6d1b575a80ff..ba85887fce40 100644
--- a/nx.html
+++ b/nx.html
@@ -32,93 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync nx
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync nx
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing nx
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced nx
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nx
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing nx
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced nx
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 nx
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/nx.txt b/nx.txt
index bcc56e18bdd6..b3b3a351758c 100644
--- a/nx.txt
+++ b/nx.txt
@@ -9,44 +9,23 @@
{'type': 'git', 'uri': 'git://anongit.gentoo.org/proj/nx.git'},
{'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/nx.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync nx
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nx
-Cloning into '/var/lib/repo-mirror-ci/sync/nx'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced nx
* Sync succeeded
$ git log --format=%ci -1
diff --git a/nymphos.html b/nymphos.html
index 2f59d0b7bbd4..e88bc03ef9cf 100644
--- a/nymphos.html
+++ b/nymphos.html
@@ -30,83 +30,19 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync nymphos
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing nymphos
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;...
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>fatal: unable to access &#x27;https://git.nymphos.ga/anon/nymphos/&#x27;: Failed to connect to git.nymphos.ga port 443: Connection timed out
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>!!! failed syncing nymphos
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing nymphos
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>fatal: unable to access &#x27;https://git.nymphos.ga/anon/nymphos/&#x27;: Failed to connect to git.nymphos.ga port 443: Connection timed out
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>!!! failed syncing nymphos
-</pre></td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync failed with 1
+ <tr class="err" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync failed with 1
</pre></td><td>[FATAL]</td></tr>
</table>
diff --git a/nymphos.txt b/nymphos.txt
index 3a6d4b0845ac..67081f56830a 100644
--- a/nymphos.txt
+++ b/nymphos.txt
@@ -8,40 +8,8 @@
'status': 'unofficial'}
* Adding new repository
$ pmaint sync nymphos
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing nymphos
Cloning into '/var/lib/repo-mirror-ci/sync/nymphos'...
fatal: unable to access 'https://git.nymphos.ga/anon/nymphos/': Failed to connect to git.nymphos.ga port 443: Connection timed out
diff --git a/octopus.html b/octopus.html
index cc53dbcccd65..18236ffd0f85 100644
--- a/octopus.html
+++ b/octopus.html
@@ -26,99 +26,51 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync octopus
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync octopus
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing octopus
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced octopus
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing octopus
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced octopus
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/octopus.txt b/octopus.txt
index 78429b6d8571..82a25e0f796e 100644
--- a/octopus.txt
+++ b/octopus.txt
@@ -6,47 +6,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/Bfgeshka/octopus.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync octopus
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing octopus
-Cloning into '/var/lib/repo-mirror-ci/sync/octopus'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced octopus
* Sync succeeded
$ git log --format=%ci -1
diff --git a/oddlama.html b/oddlama.html
index 0263cd45bc2f..b1e065379236 100644
--- a/oddlama.html
+++ b/oddlama.html
@@ -34,99 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync oddlama
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync oddlama
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing oddlama
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced oddlama
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oddlama
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing oddlama
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced oddlama
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oddlama
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/oddlama.txt b/oddlama.txt
index b68fe4b5945f..d72e487e05b8 100644
--- a/oddlama.txt
+++ b/oddlama.txt
@@ -10,47 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/oddlama/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync oddlama
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing oddlama
-Cloning into '/var/lib/repo-mirror-ci/sync/oddlama'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced oddlama
* Sync succeeded
$ git log --format=%ci -1
diff --git a/olifre.html b/olifre.html
index b9e196202458..afa548e9fcba 100644
--- a/olifre.html
+++ b/olifre.html
@@ -38,99 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync olifre
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync olifre
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing olifre
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:lmiphay repo at &#x27;/var/lib/repo-mirror-ci/sync/lmiphay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:megacoffee repo at &#x27;/var/lib/repo-mirror-ci/sync/megacoffee&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mschiff repo at &#x27;/var/lib/repo-mirror-ci/sync/mschiff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:myrvolay repo at &#x27;/var/lib/repo-mirror-ci/sync/myrvolay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:natinst repo at &#x27;/var/lib/repo-mirror-ci/sync/natinst&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced olifre
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nelson-graca repo at &#x27;/var/lib/repo-mirror-ci/sync/nelson-graca&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 olifre
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing olifre
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced olifre
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 olifre
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/olifre.txt b/olifre.txt
index bebfd1a17c43..748c759f95aa 100644
--- a/olifre.txt
+++ b/olifre.txt
@@ -12,47 +12,23 @@
'uri': 'git://github.com/olifre/olifre-portage.git'},
{'type': 'git', 'uri': 'git@github.com:olifre/olifre-portage.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync olifre
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lmiphay repo at '/var/lib/repo-mirror-ci/sync/lmiphay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:megacoffee repo at '/var/lib/repo-mirror-ci/sync/megacoffee', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:myrvolay repo at '/var/lib/repo-mirror-ci/sync/myrvolay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:natinst repo at '/var/lib/repo-mirror-ci/sync/natinst', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nelson-graca repo at '/var/lib/repo-mirror-ci/sync/nelson-graca', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing olifre
-Cloning into '/var/lib/repo-mirror-ci/sync/olifre'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced olifre
* Sync succeeded
$ git log --format=%ci -1
diff --git a/openclonk.html b/openclonk.html
index bb70e22fab21..5c99fe4088bf 100644
--- a/openclonk.html
+++ b/openclonk.html
@@ -36,93 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync openclonk
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync openclonk
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing openclonk
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced openclonk
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing openclonk
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced openclonk
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openclonk
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/openclonk.txt b/openclonk.txt
index a3e8b6c28b7d..219ed04ab424 100644
--- a/openclonk.txt
+++ b/openclonk.txt
@@ -11,44 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/jcaesar/openclonk-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync openclonk
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing openclonk
-Cloning into '/var/lib/repo-mirror-ci/sync/openclonk'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced openclonk
* Sync succeeded
$ git log --format=%ci -1
diff --git a/openwrt.html b/openwrt.html
index deac82098e6b..d63564a3267a 100644
--- a/openwrt.html
+++ b/openwrt.html
@@ -30,93 +30,51 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync openwrt
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync openwrt
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing openwrt
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nitratesky repo at &#x27;/var/lib/repo-mirror-ci/sync/nitratesky&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nix-guix repo at &#x27;/var/lib/repo-mirror-ci/sync/nix-guix&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced openwrt
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openwrt
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing openwrt
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced openwrt
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 openwrt
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/openwrt.txt b/openwrt.txt
index 9f8e7e665c9a..e123bbbfd6e3 100644
--- a/openwrt.txt
+++ b/openwrt.txt
@@ -8,44 +8,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-openwrt'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync openwrt
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nitratesky repo at '/var/lib/repo-mirror-ci/sync/nitratesky', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nix-guix repo at '/var/lib/repo-mirror-ci/sync/nix-guix', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing openwrt
-Cloning into '/var/lib/repo-mirror-ci/sync/openwrt'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced openwrt
* Sync succeeded
$ git log --format=%ci -1
diff --git a/oubliette.html b/oubliette.html
index 5c374a812cf5..2ed8755034be 100644
--- a/oubliette.html
+++ b/oubliette.html
@@ -32,93 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync oubliette
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync oubliette
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing oubliette
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced oubliette
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oubliette
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing oubliette
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced oubliette
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 oubliette
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/oubliette.txt b/oubliette.txt
index 8c71ee40778e..19178c367be3 100644
--- a/oubliette.txt
+++ b/oubliette.txt
@@ -9,44 +9,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/nabbi/oubliette-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync oubliette
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing oubliette
-Cloning into '/var/lib/repo-mirror-ci/sync/oubliette'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced oubliette
* Sync succeeded
$ git log --format=%ci -1
diff --git a/overseerr-overlay.html b/overseerr-overlay.html
index 3fdbb1b218ed..1eb271506dfc 100644
--- a/overseerr-overlay.html
+++ b/overseerr-overlay.html
@@ -36,93 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync overseerr-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync overseerr-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing overseerr-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:haskell repo at &#x27;/var/lib/repo-mirror-ci/sync/haskell&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mva repo at &#x27;/var/lib/repo-mirror-ci/sync/mva&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:np-hardass-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/np-hardass-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced overseerr-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 overseerr-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing overseerr-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced overseerr-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 overseerr-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/overseerr-overlay.txt b/overseerr-overlay.txt
index 29e888d96168..068c93aa9cc3 100644
--- a/overseerr-overlay.txt
+++ b/overseerr-overlay.txt
@@ -11,44 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync overseerr-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:haskell repo at '/var/lib/repo-mirror-ci/sync/haskell', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mva repo at '/var/lib/repo-mirror-ci/sync/mva', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:np-hardass-overlay repo at '/var/lib/repo-mirror-ci/sync/np-hardass-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing overseerr-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/overseerr-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced overseerr-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/palemoon.html b/palemoon.html
index 8d4e67ca0ecd..72a2811c7ab4 100644
--- a/palemoon.html
+++ b/palemoon.html
@@ -34,87 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync palemoon
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync palemoon
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing palemoon
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced palemoon
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 palemoon
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing palemoon
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced palemoon
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 palemoon
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/palemoon.txt b/palemoon.txt
index ef7d06ae692d..6b16e246e3aa 100644
--- a/palemoon.txt
+++ b/palemoon.txt
@@ -10,41 +10,23 @@
{'type': 'git', 'uri': 'git://github.com/deu/palemoon-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:deu/palemoon-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync palemoon
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing palemoon
-Cloning into '/var/lib/repo-mirror-ci/sync/palemoon'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced palemoon
* Sync succeeded
$ git log --format=%ci -1
diff --git a/panther.html b/panther.html
index 3efac542f5fd..37bab3d27a3f 100644
--- a/panther.html
+++ b/panther.html
@@ -36,89 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync panther
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync panther
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing panther
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced panther
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 panther
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing panther
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced panther
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 panther
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/panther.txt b/panther.txt
index e5b76c277e58..4dd86e759dd8 100644
--- a/panther.txt
+++ b/panther.txt
@@ -11,42 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/orangeturtle739/panther.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync panther
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing panther
-Cloning into '/var/lib/repo-mirror-ci/sync/panther'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced panther
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pdilung.html b/pdilung.html
index 56e2a6be6add..10221458a2b9 100644
--- a/pdilung.html
+++ b/pdilung.html
@@ -40,83 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync pdilung
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync pdilung
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing pdilung
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nest repo at &#x27;/var/lib/repo-mirror-ci/sync/nest&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:octopus repo at &#x27;/var/lib/repo-mirror-ci/sync/octopus&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:oddlama repo at &#x27;/var/lib/repo-mirror-ci/sync/oddlama&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:olifre repo at &#x27;/var/lib/repo-mirror-ci/sync/olifre&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced pdilung
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pdilung
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing pdilung
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced pdilung
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pdilung
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pdilung.txt b/pdilung.txt
index 53c081758364..0f015dce6e3b 100644
--- a/pdilung.txt
+++ b/pdilung.txt
@@ -13,39 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:pdilung/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pdilung
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nest repo at '/var/lib/repo-mirror-ci/sync/nest', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:octopus repo at '/var/lib/repo-mirror-ci/sync/octopus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oddlama repo at '/var/lib/repo-mirror-ci/sync/oddlama', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:olifre repo at '/var/lib/repo-mirror-ci/sync/olifre', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pdilung
-Cloning into '/var/lib/repo-mirror-ci/sync/pdilung'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pdilung
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pentoo.html b/pentoo.html
index 5554729c1e16..3d96cde2e2d2 100644
--- a/pentoo.html
+++ b/pentoo.html
@@ -32,87 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pentoo
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pentoo
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing pentoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pentoo
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pentoo
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing pentoo
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced pentoo
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pentoo
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pentoo.txt b/pentoo.txt
index 96269b4a8dd0..66d73ba6d6c1 100644
--- a/pentoo.txt
+++ b/pentoo.txt
@@ -9,41 +9,23 @@
'uri': 'git://github.com/pentoo/pentoo-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:pentoo/pentoo-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync pentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/pentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/perl-experimental-snapshots.html b/perl-experimental-snapshots.html
index 8ba74b351837..3decbb9ad54d 100644
--- a/perl-experimental-snapshots.html
+++ b/perl-experimental-snapshots.html
@@ -38,83 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync perl-experimental-snapshots
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync perl-experimental-snapshots
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing perl-experimental-snapshots
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced perl-experimental-snapshots
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 perl-experimental-snapshots
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing perl-experimental-snapshots
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced perl-experimental-snapshots
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 perl-experimental-snapshots
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/perl-experimental-snapshots.txt b/perl-experimental-snapshots.txt
index a4bbbe8d4a7f..235ca4868410 100644
--- a/perl-experimental-snapshots.txt
+++ b/perl-experimental-snapshots.txt
@@ -12,39 +12,24 @@
{'type': 'git',
'uri': 'git://github.com/gentoo-perl/perl-experimental-snapshots.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync perl-experimental-snapshots
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing perl-experimental-snapshots
-Cloning into '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced perl-experimental-snapshots
* Sync succeeded
$ git log --format=%ci -1
diff --git a/perl-experimental.html b/perl-experimental.html
index f7fd2b8351fa..6bd17133f0af 100644
--- a/perl-experimental.html
+++ b/perl-experimental.html
@@ -44,87 +44,51 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync perl-experimental
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync perl-experimental
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing perl-experimental
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nico repo at &#x27;/var/lib/repo-mirror-ci/sync/nico&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:openclonk repo at &#x27;/var/lib/repo-mirror-ci/sync/openclonk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:openwrt repo at &#x27;/var/lib/repo-mirror-ci/sync/openwrt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced perl-experimental
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 perl-experimental
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing perl-experimental
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced perl-experimental
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 perl-experimental
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/perl-experimental.txt b/perl-experimental.txt
index 7e523df0c1dc..caa1ea3afd59 100644
--- a/perl-experimental.txt
+++ b/perl-experimental.txt
@@ -15,41 +15,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/perl-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync perl-experimental
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nico repo at '/var/lib/repo-mirror-ci/sync/nico', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openclonk repo at '/var/lib/repo-mirror-ci/sync/openclonk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:openwrt repo at '/var/lib/repo-mirror-ci/sync/openwrt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing perl-experimental
-Cloning into '/var/lib/repo-mirror-ci/sync/perl-experimental'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced perl-experimental
* Sync succeeded
$ git log --format=%ci -1
diff --git a/petkovich.html b/petkovich.html
index eda887c087bd..5b9917a751ea 100644
--- a/petkovich.html
+++ b/petkovich.html
@@ -40,89 +40,57 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync petkovich
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync petkovich
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing petkovich
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced petkovich
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 petkovich
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing petkovich
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced petkovich
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 petkovich
-</pre></td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * media-fonts/powerline-fonts-9999-r1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-fonts/powerline-fonts-9999-r1: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-fonts/powerline-symbols-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * media-fonts/powerline-symbols-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-fonts/ttf-font-icons-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-fonts/ttf-font-icons-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/petkovich.txt b/petkovich.txt
index 68d901007d22..da994b2962b6 100644
--- a/petkovich.txt
+++ b/petkovich.txt
@@ -13,39 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:jcpetkovich/overlay-petkovich.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync petkovich
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing petkovich
-Cloning into '/var/lib/repo-mirror-ci/sync/petkovich'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced petkovich
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pf4public.html b/pf4public.html
index 212a8fea0a12..ab03aebd2a1c 100644
--- a/pf4public.html
+++ b/pf4public.html
@@ -36,323 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pf4public
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync pf4public
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing pf4public
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced pf4public
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pf4public
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing pf4public
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced pf4public
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pf4public
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f0ed7ac5280&gt;
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;7988&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;7988&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>--- Logging error ---
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;7988&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre>During handling of the above exception, another exception occurred:
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 219, in emit
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> self.out.write(line, wrap=True)
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 235, in write
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> self._write_prefix(wrap)
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/formatters.py&quot;, line 185, in _write_prefix
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> self.stream.write(thing)
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>ValueError: write to closed file
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre>Call stack:
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 78, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> logger.error(e)
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1471, in error
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> self._log(ERROR, msg, args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1585, in _log
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> self.handle(record)
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1595, in handle
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> self.callHandlers(record)
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 1657, in callHandlers
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> hdlr.handle(record)
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/logging/__init__.py&quot;, line 950, in handle
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> self.emit(record)
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py&quot;, line 221, in emit
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> self.handleError(record)
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre>Message: TimeoutError(&quot;ebp for pid &#x27;7988&#x27; appears dead, timing out&quot;)
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre>Arguments: ()
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;7988&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f0ed81b04c0&gt;
-</pre></td></tr>
- <tr class="" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l161"><td><a href="#l161"><span>161</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l162"><td><a href="#l162"><span>162</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l163"><td><a href="#l163"><span>163</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l164"><td><a href="#l164"><span>164</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l165"><td><a href="#l165"><span>165</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l166"><td><a href="#l166"><span>166</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l167"><td><a href="#l167"><span>167</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l168"><td><a href="#l168"><span>168</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l169"><td><a href="#l169"><span>169</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l170"><td><a href="#l170"><span>170</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l171"><td><a href="#l171"><span>171</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;7988&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l172"><td><a href="#l172"><span>172</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pf4public.txt b/pf4public.txt
index 4aa73abfea08..a9a99321b3b1 100644
--- a/pf4public.txt
+++ b/pf4public.txt
@@ -11,162 +11,27 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/PF4Public/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pf4public
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pf4public
-Cloning into '/var/lib/repo-mirror-ci/sync/pf4public'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pf4public
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pf4public
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f0ed7ac5280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '7988' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '7988' appears dead, timing out
---- Logging error ---
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '7988' appears dead, timing out
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 219, in emit
- self.out.write(line, wrap=True)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 235, in write
- self._write_prefix(wrap)
- File "/usr/lib/python3.8/site-packages/snakeoil/formatters.py", line 185, in _write_prefix
- self.stream.write(thing)
-ValueError: write to closed file
-Call stack:
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 78, in shutdown_all_processors
- logger.error(e)
- File "/usr/lib/python3.8/logging/__init__.py", line 1471, in error
- self._log(ERROR, msg, args, **kwargs)
- File "/usr/lib/python3.8/logging/__init__.py", line 1585, in _log
- self.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1595, in handle
- self.callHandlers(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 1657, in callHandlers
- hdlr.handle(record)
- File "/usr/lib/python3.8/logging/__init__.py", line 950, in handle
- self.emit(record)
- File "/usr/lib/python3.8/site-packages/snakeoil/cli/tool.py", line 221, in emit
- self.handleError(record)
-Message: TimeoutError("ebp for pid '7988' appears dead, timing out")
-Arguments: ()
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '7988' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f0ed81b04c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '7988' appears dead, timing out
* Cache regenerated successfully
diff --git a/pg_overlay.html b/pg_overlay.html
index 8ff302499007..6d9d273c0dcb 100644
--- a/pg_overlay.html
+++ b/pg_overlay.html
@@ -32,81 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pg_overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pg_overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing pg_overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:oubliette repo at &#x27;/var/lib/repo-mirror-ci/sync/oubliette&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pdilung repo at &#x27;/var/lib/repo-mirror-ci/sync/pdilung&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced pg_overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pg_overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing pg_overlay
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced pg_overlay
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pg_overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pg_overlay.txt b/pg_overlay.txt
index 93b0fc0207fa..cc0a918426b3 100644
--- a/pg_overlay.txt
+++ b/pg_overlay.txt
@@ -9,38 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/Perfect_Gentleman/PG_Overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pg_overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:oubliette repo at '/var/lib/repo-mirror-ci/sync/oubliette', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pdilung repo at '/var/lib/repo-mirror-ci/sync/pdilung', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pg_overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/pg_overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pg_overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/phackerlay.html b/phackerlay.html
index 67313a65f167..7387d52c307c 100644
--- a/phackerlay.html
+++ b/phackerlay.html
@@ -32,95 +32,61 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync phackerlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync phackerlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing phackerlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced phackerlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 phackerlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing phackerlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced phackerlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 phackerlay
-</pre></td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * net-libs/ccnet-6.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * net-libs/ccnet-6.1.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * net-libs/ccnet-server-7.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * net-libs/ccnet-server-7.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * net-libs/libevhtp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * net-libs/libevhtp-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * net-libs/libsearpc-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-libs/libsearpc-3.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/phackerlay.txt b/phackerlay.txt
index d754bf72cf1e..f8b52feb5308 100644
--- a/phackerlay.txt
+++ b/phackerlay.txt
@@ -9,41 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync phackerlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing phackerlay
-Cloning into '/var/lib/repo-mirror-ci/sync/phackerlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced phackerlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/phoenix591.html b/phoenix591.html
index 6a91327e3fa3..6089a1c2abb2 100644
--- a/phoenix591.html
+++ b/phoenix591.html
@@ -36,87 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync phoenix591
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync phoenix591
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing phoenix591
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced phoenix591
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 phoenix591
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing phoenix591
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced phoenix591
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 phoenix591
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/phoenix591.txt b/phoenix591.txt
index 5e987964b27b..560ba15778ea 100644
--- a/phoenix591.txt
+++ b/phoenix591.txt
@@ -11,41 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Phoenix591/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync phoenix591
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing phoenix591
-Cloning into '/var/lib/repo-mirror-ci/sync/phoenix591'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced phoenix591
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pholthaus-overlay.html b/pholthaus-overlay.html
index 4ee42f825399..39967f1c75c3 100644
--- a/pholthaus-overlay.html
+++ b/pholthaus-overlay.html
@@ -36,87 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pholthaus-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync pholthaus-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing pholthaus-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced pholthaus-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pholthaus-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing pholthaus-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced pholthaus-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pholthaus-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pholthaus-overlay.txt b/pholthaus-overlay.txt
index 6e2a130e2544..80a9969ac380 100644
--- a/pholthaus-overlay.txt
+++ b/pholthaus-overlay.txt
@@ -11,41 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/pholthau/pholthaus-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pholthaus-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pholthaus-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/pholthaus-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pholthaus-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pica-pica.html b/pica-pica.html
index 1ce1915dc4fc..d72ee30cfc22 100644
--- a/pica-pica.html
+++ b/pica-pica.html
@@ -30,89 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync pica-pica
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pica-pica
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing pica-pica
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced pica-pica
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pica-pica
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing pica-pica
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced pica-pica
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pica-pica
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pica-pica.txt b/pica-pica.txt
index 1e1710b14f1d..2af60eca8eab 100644
--- a/pica-pica.txt
+++ b/pica-pica.txt
@@ -8,42 +8,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pica-pica
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pica-pica
-Cloning into '/var/lib/repo-mirror-ci/sync/pica-pica'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pica-pica
* Sync succeeded
$ git log --format=%ci -1
diff --git a/picarica-overlay.html b/picarica-overlay.html
index c4ef97b3b6f7..b8c7e7b471e3 100644
--- a/picarica-overlay.html
+++ b/picarica-overlay.html
@@ -36,235 +36,57 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync picarica-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync picarica-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing picarica-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:overseerr-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/overseerr-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:palemoon repo at &#x27;/var/lib/repo-mirror-ci/sync/palemoon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:panther repo at &#x27;/var/lib/repo-mirror-ci/sync/panther&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced picarica-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 picarica-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing picarica-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced picarica-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 picarica-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7fc89cddd280&gt;
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;30559&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;30559&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;30559&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="err" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> * gui-apps/blurwal-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * gui-apps/blurwal-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> * gui-apps/blurwal-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * gui-apps/blurwal-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;30559&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7fc89d4c84c0&gt;
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;30559&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/picarica-overlay.txt b/picarica-overlay.txt
index e775749010bc..d6c73ffe1e01 100644
--- a/picarica-overlay.txt
+++ b/picarica-overlay.txt
@@ -11,118 +11,29 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/picarica/picarica-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync picarica-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:overseerr-overlay repo at '/var/lib/repo-mirror-ci/sync/overseerr-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:palemoon repo at '/var/lib/repo-mirror-ci/sync/palemoon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:panther repo at '/var/lib/repo-mirror-ci/sync/panther', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing picarica-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/picarica-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced picarica-overlay
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 picarica-overlay
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7fc89cddd280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '30559' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '30559' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '30559' appears dead, timing out
* gui-apps/blurwal-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
* gui-apps/blurwal-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
-ERROR pkgcore: ebp for pid '30559' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7fc89d4c84c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '30559' appears dead, timing out
* Cache regen failed with 1
diff --git a/pigfoot.html b/pigfoot.html
index 9cb29b06d651..396dc1a6efab 100644
--- a/pigfoot.html
+++ b/pigfoot.html
@@ -34,107 +34,65 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pigfoot
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pigfoot
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing pigfoot
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced pigfoot
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pigfoot
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing pigfoot
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced pigfoot
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pigfoot
-</pre></td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-db/leveldb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-db/leveldb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-db/rocksdb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-db/rocksdb-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-util/cargo-0.30.0-r1: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cargo, (cargo.eclass, line 21: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-util/cargo-0.30.0-r1: failed sourcing ebuild: Unsupported EAPI=6 (too old) for cargo, (cargo.eclass, line 21: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-libs/grpc-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-libs/grpc-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * net-misc/spdylay-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-misc/spdylay-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * sci-libs/mxnet-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/pigfoot.txt b/pigfoot.txt
index b666a7dc421c..46d6a5f4cf40 100644
--- a/pigfoot.txt
+++ b/pigfoot.txt
@@ -10,45 +10,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/pigfoot.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pigfoot
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pigfoot
-Cloning into '/var/lib/repo-mirror-ci/sync/pigfoot'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pigfoot
* Sync succeeded
$ git log --format=%ci -1
diff --git a/piniverlay.html b/piniverlay.html
index 770add634fa0..2dc3cfaebf88 100644
--- a/piniverlay.html
+++ b/piniverlay.html
@@ -40,97 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync piniverlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync piniverlay
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing piniverlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:mysql repo at &#x27;/var/lib/repo-mirror-ci/sync/mysql&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nx repo at &#x27;/var/lib/repo-mirror-ci/sync/nx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced piniverlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 piniverlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing piniverlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced piniverlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 piniverlay
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/piniverlay.txt b/piniverlay.txt
index fbe35b8ac81f..ac23d959ff47 100644
--- a/piniverlay.txt
+++ b/piniverlay.txt
@@ -13,46 +13,24 @@
{'type': 'git',
'uri': 'git@github.com:pinicarus/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync piniverlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nx repo at '/var/lib/repo-mirror-ci/sync/nx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing piniverlay
-Cloning into '/var/lib/repo-mirror-ci/sync/piniverlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced piniverlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pinkbyte.html b/pinkbyte.html
index 3efaf25e4959..3c49315599f3 100644
--- a/pinkbyte.html
+++ b/pinkbyte.html
@@ -36,95 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pinkbyte
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync pinkbyte
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing pinkbyte
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced pinkbyte
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pinkbyte
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing pinkbyte
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced pinkbyte
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pinkbyte
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pinkbyte.txt b/pinkbyte.txt
index 03694428ddc5..e4df96f91bd5 100644
--- a/pinkbyte.txt
+++ b/pinkbyte.txt
@@ -11,45 +11,24 @@
{'type': 'git',
'uri': 'git://github.com/Pinkbyte/pinkbyte-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync pinkbyte
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pinkbyte
-Cloning into '/var/lib/repo-mirror-ci/sync/pinkbyte'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pinkbyte
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pixlra.html b/pixlra.html
index f28df64b0bce..01b0a381de95 100644
--- a/pixlra.html
+++ b/pixlra.html
@@ -44,249 +44,53 @@
</pre></td></tr>
<tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync pixlra
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint sync pixlra
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing pixlra
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:petkovich repo at &#x27;/var/lib/repo-mirror-ci/sync/petkovich&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** synced pixlra
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** syncing pixlra
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;...
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** synced pixlra
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>Exception ignored in: &lt;function _RegenOpHelper.__del__ at 0x7f2c1f145280&gt;
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py&quot;, line 660, in __del__
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> self.ebp.disable_eclass_caching()
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 627, in disable_eclass_caching
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> self.clear_preloaded_eclasses()
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 592, in clear_preloaded_eclasses
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;13529&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;13529&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre>Error in atexit._run_exitfuncs:
-</pre></td></tr>
- <tr class="" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py&quot;, line 105, in run_exitfuncs
-</pre></td></tr>
- <tr class="" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> func(*targs, **kargs)
-</pre></td></tr>
- <tr class="" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 49, in _inner
-</pre></td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> return functor(*args, **kwargs)
-</pre></td></tr>
- <tr class="" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 65, in shutdown_all_processors
-</pre></td></tr>
- <tr class="" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> active_ebp_list.pop().shutdown_processor(
-</pre></td></tr>
- <tr class="" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 696, in shutdown_processor
-</pre></td></tr>
- <tr class="" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;13529&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre>ERROR pkgcore: ebp for pid &#x27;13529&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre>Exception ignored in: &lt;function EbuildProcessor.__del__ at 0x7f2c1f8304c0&gt;
-</pre></td></tr>
- <tr class="" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre>Traceback (most recent call last):
-</pre></td></tr>
- <tr class="" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 778, in __del__
-</pre></td></tr>
- <tr class="" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> if self.is_responsive:
-</pre></td></tr>
- <tr class="" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 685, in is_responsive
-</pre></td></tr>
- <tr class="" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> if self.expect(&quot;yep!&quot;, timeout=10):
-</pre></td></tr>
- <tr class="" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 527, in expect
-</pre></td></tr>
- <tr class="" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> return self._consume_async_expects()
-</pre></td></tr>
- <tr class="" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 493, in _consume_async_expects
-</pre></td></tr>
- <tr class="" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> got = [x.rstrip(&#x27;\n&#x27;) for x in self.readlines(len(self._outstanding_expects))]
-</pre></td></tr>
- <tr class="" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 532, in readlines
-</pre></td></tr>
- <tr class="" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> mydata.append(self.ebd_read.readline())
-</pre></td></tr>
- <tr class="" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> File &quot;/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py&quot;, line 499, in _timeout_ebp
-</pre></td></tr>
- <tr class="" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> raise TimeoutError(&quot;ebp for pid &#x27;%i&#x27; appears dead, timing out&quot; % self.pid)
-</pre></td></tr>
- <tr class="" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre>pkgcore.ebuild.processor.TimeoutError: ebp for pid &#x27;13529&#x27; appears dead, timing out
-</pre></td></tr>
- <tr class="" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pixlra.txt b/pixlra.txt
index 244a7b6341d7..ea7fb199e216 100644
--- a/pixlra.txt
+++ b/pixlra.txt
@@ -15,125 +15,27 @@
{'type': 'git',
'uri': 'https://github.com/pixlra/pixlra-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pixlra
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:petkovich repo at '/var/lib/repo-mirror-ci/sync/petkovich', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pixlra
-Cloning into '/var/lib/repo-mirror-ci/sync/pixlra'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pixlra
* Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra
-Exception ignored in: <function _RegenOpHelper.__del__ at 0x7f2c1f145280>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/repository.py", line 660, in __del__
- self.ebp.disable_eclass_caching()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 627, in disable_eclass_caching
- self.clear_preloaded_eclasses()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 592, in clear_preloaded_eclasses
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '13529' appears dead, timing out
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '13529' appears dead, timing out
-Error in atexit._run_exitfuncs:
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/snakeoil/process/spawn.py", line 105, in run_exitfuncs
- func(*targs, **kargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 49, in _inner
- return functor(*args, **kwargs)
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 65, in shutdown_all_processors
- active_ebp_list.pop().shutdown_processor(
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 696, in shutdown_processor
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '13529' appears dead, timing out
-ERROR pkgcore: ebp for pid '13529' appears dead, timing out
-Exception ignored in: <function EbuildProcessor.__del__ at 0x7f2c1f8304c0>
-Traceback (most recent call last):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 778, in __del__
- if self.is_responsive:
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 685, in is_responsive
- if self.expect("yep!", timeout=10):
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 527, in expect
- return self._consume_async_expects()
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 493, in _consume_async_expects
- got = [x.rstrip('\n') for x in self.readlines(len(self._outstanding_expects))]
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 532, in readlines
- mydata.append(self.ebd_read.readline())
- File "/usr/lib/python3.8/site-packages/pkgcore/ebuild/processor.py", line 499, in _timeout_ebp
- raise TimeoutError("ebp for pid '%i' appears dead, timing out" % self.pid)
-pkgcore.ebuild.processor.TimeoutError: ebp for pid '13529' appears dead, timing out
* Cache regenerated successfully
diff --git a/pkalin.html b/pkalin.html
index 0a2928f05d2f..21c3ffb34f38 100644
--- a/pkalin.html
+++ b/pkalin.html
@@ -34,97 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pkalin
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync pkalin
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing pkalin
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced pkalin
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pkalin
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing pkalin
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced pkalin
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pkalin
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pkalin.txt b/pkalin.txt
index 1d5059033e28..43597566bedc 100644
--- a/pkalin.txt
+++ b/pkalin.txt
@@ -10,46 +10,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/thinrope/pkalin.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pkalin
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pkalin
-Cloning into '/var/lib/repo-mirror-ci/sync/pkalin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pkalin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/plex-overlay.html b/plex-overlay.html
index 0181361b778d..3f50088266f5 100644
--- a/plex-overlay.html
+++ b/plex-overlay.html
@@ -34,99 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync plex-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync plex-overlay
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing plex-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced plex-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 plex-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing plex-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced plex-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 plex-overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/plex-overlay.txt b/plex-overlay.txt
index 88ac2aa6eccd..9fe602600a55 100644
--- a/plex-overlay.txt
+++ b/plex-overlay.txt
@@ -10,47 +10,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/comio/plex-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync plex-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing plex-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/plex-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced plex-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/poly-c.html b/poly-c.html
index 301022e16105..90914e3afade 100644
--- a/poly-c.html
+++ b/poly-c.html
@@ -28,181 +28,109 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync poly-c
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync poly-c
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing poly-c
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>-------------------------------------------------------------------------------
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Welcome to rsync.gentoofan.org:873
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:luke-jr repo at &#x27;/var/lib/repo-mirror-ci/sync/luke-jr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>This is the gentoo portage-overlay of Polynomial-C
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>-------------------------------------------------------------------------------
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> ,-~~-.___.
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> / | &#x27; \
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>( ) 0
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> \_/-, ,----&#x27;
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> ==== //
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> / \-&#x27;~; /~~~(O)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> / __/~| / |
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:phoenix591 repo at &#x27;/var/lib/repo-mirror-ci/sync/phoenix591&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>=( _____| (_________|
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pholthaus-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pholthaus-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pica-pica repo at &#x27;/var/lib/repo-mirror-ci/sync/pica-pica&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>-server specs:
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> -CPU Intel Core i7
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> -RAM 16 GB
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> -OS Gentoo GNU/Linux (Kernel 5.x)
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> -BANDWIDTH 100 MBit
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> -LIMIT 50 users (concurrently)
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> -LOCATION Nuernberg/Germany
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> -CONTACT polynomial-c@gentoo.org
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>-------------------------------------------------------------------------------
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Number of files: 1 (reg: 1)
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of regular files transferred: 1
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Total file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total transferred file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Literal data: 32 bytes
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing poly-c
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>File list size: 47
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>-------------------------------------------------------------------------------
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Welcome to rsync.gentoofan.org:873
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>This is the gentoo portage-overlay of Polynomial-C
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Total bytes sent: 85
</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Total bytes received: 131
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>-------------------------------------------------------------------------------
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>sent 85 bytes received 131 bytes 61.71 bytes/sec
</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> ,-~~-.___.
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> / | &#x27; \
+ <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced poly-c
</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>( ) 0
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> \_/-, ,----&#x27;
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> ==== //
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 poly-c
</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> / \-&#x27;~; /~~~(O)
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> / __/~| / |
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>=( _____| (_________|
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>-server specs:
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> -CPU Intel Core i7
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> -RAM 16 GB
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> -OS Gentoo GNU/Linux (Kernel 5.x)
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> -BANDWIDTH 100 MBit
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> -LIMIT 50 users (concurrently)
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> -LOCATION Nuernberg/Germany
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> -CONTACT polynomial-c@gentoo.org
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>-------------------------------------------------------------------------------
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>Number of files: 1,634 (reg: 1,190, dir: 444)
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>Number of created files: 1,634 (reg: 1,190, dir: 444)
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Number of regular files transferred: 1,190
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>Total file size: 3.96M bytes
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>Total transferred file size: 3.96M bytes
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>Literal data: 3.96M bytes
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre>File list size: 34.48K
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre>Total bytes sent: 24.76K
-</pre></td></tr>
- <tr class="" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre>Total bytes received: 2.46M
-</pre></td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre>sent 24.76K bytes received 2.46M bytes 451.06K bytes/sec
-</pre></td></tr>
- <tr class="" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre>total size is 3.96M speedup is 1.60
-</pre></td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre>*** synced poly-c
-</pre></td></tr>
- <tr class="" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 poly-c
-</pre></td></tr>
- <tr class="" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/poly-c.txt b/poly-c.txt
index 14d1fbbe0c98..c4a22f4af1f2 100644
--- a/poly-c.txt
+++ b/poly-c.txt
@@ -7,45 +7,9 @@
'quality': 'experimental',
'source': [{'type': 'rsync', 'uri': 'rsync://rsync.gentoofan.org/poly-c'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync poly-c
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:luke-jr repo at '/var/lib/repo-mirror-ci/sync/luke-jr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phoenix591 repo at '/var/lib/repo-mirror-ci/sync/phoenix591', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pholthaus-overlay repo at '/var/lib/repo-mirror-ci/sync/pholthaus-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pica-pica repo at '/var/lib/repo-mirror-ci/sync/pica-pica', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing poly-c
-------------------------------------------------------------------------------
Welcome to rsync.gentoofan.org:873
@@ -74,22 +38,22 @@ This is the gentoo portage-overlay of Polynomial-C
-------------------------------------------------------------------------------
-Number of files: 1,634 (reg: 1,190, dir: 444)
-Number of created files: 1,634 (reg: 1,190, dir: 444)
+Number of files: 1 (reg: 1)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 1,190
-Total file size: 3.96M bytes
-Total transferred file size: 3.96M bytes
-Literal data: 3.96M bytes
+Number of regular files transferred: 1
+Total file size: 32 bytes
+Total transferred file size: 32 bytes
+Literal data: 32 bytes
Matched data: 0 bytes
-File list size: 34.48K
+File list size: 47
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 24.76K
-Total bytes received: 2.46M
+Total bytes sent: 85
+Total bytes received: 131
-sent 24.76K bytes received 2.46M bytes 451.06K bytes/sec
-total size is 3.96M speedup is 1.60
+sent 85 bytes received 131 bytes 61.71 bytes/sec
+total size is 32 speedup is 0.15
*** synced poly-c
* Sync succeeded
$ stat --format=%y .
diff --git a/powerman.html b/powerman.html
index 783ae3ed55c4..1bb6c7d0fe52 100644
--- a/powerman.html
+++ b/powerman.html
@@ -30,95 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync powerman
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync powerman
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing powerman
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced powerman
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 powerman
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:plex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing powerman
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced powerman
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 powerman
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/powerman.txt b/powerman.txt
index b8c9d80ae5ac..ea3023d8cbc7 100644
--- a/powerman.txt
+++ b/powerman.txt
@@ -8,45 +8,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/powerman/powerman-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync powerman
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:plex-overlay repo at '/var/lib/repo-mirror-ci/sync/plex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing powerman
-Cloning into '/var/lib/repo-mirror-ci/sync/powerman'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced powerman
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ppfeufer-gentoo-overlay.html b/ppfeufer-gentoo-overlay.html
index e3c463c80162..ec6d9a3c8e86 100644
--- a/ppfeufer-gentoo-overlay.html
+++ b/ppfeufer-gentoo-overlay.html
@@ -36,97 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync ppfeufer-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ppfeufer-gentoo-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing ppfeufer-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced ppfeufer-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ppfeufer-gentoo-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:plex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing ppfeufer-gentoo-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced ppfeufer-gentoo-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ppfeufer-gentoo-overlay
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ppfeufer-gentoo-overlay.txt b/ppfeufer-gentoo-overlay.txt
index 4ff9278333d1..22b459de3f86 100644
--- a/ppfeufer-gentoo-overlay.txt
+++ b/ppfeufer-gentoo-overlay.txt
@@ -11,46 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/ppfeufer/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ppfeufer-gentoo-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:plex-overlay repo at '/var/lib/repo-mirror-ci/sync/plex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ppfeufer-gentoo-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ppfeufer-gentoo-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pross.html b/pross.html
index 5d952ce68fa9..9a6729656eac 100644
--- a/pross.html
+++ b/pross.html
@@ -32,93 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync pross
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync pross
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing pross
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pf4public repo at &#x27;/var/lib/repo-mirror-ci/sync/pf4public&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:piniverlay repo at &#x27;/var/lib/repo-mirror-ci/sync/piniverlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced pross
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pinkbyte repo at &#x27;/var/lib/repo-mirror-ci/sync/pinkbyte&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pross
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:plex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing pross
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced pross
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pross
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pross.txt b/pross.txt
index 8fd8f62aac2d..201da6ce5643 100644
--- a/pross.txt
+++ b/pross.txt
@@ -9,44 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/Pross/pross-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pross
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pf4public repo at '/var/lib/repo-mirror-ci/sync/pf4public', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:piniverlay repo at '/var/lib/repo-mirror-ci/sync/piniverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pinkbyte repo at '/var/lib/repo-mirror-ci/sync/pinkbyte', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:plex-overlay repo at '/var/lib/repo-mirror-ci/sync/plex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pross
-Cloning into '/var/lib/repo-mirror-ci/sync/pross'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pross
* Sync succeeded
$ git log --format=%ci -1
diff --git a/pyfa.html b/pyfa.html
index 0058cd46ab80..0196ee90672f 100644
--- a/pyfa.html
+++ b/pyfa.html
@@ -38,95 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync pyfa
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync pyfa
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing pyfa
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:picarica-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/picarica-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:plex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced pyfa
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pyfa
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing pyfa
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced pyfa
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pyfa
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/pyfa.txt b/pyfa.txt
index 1a7915d7e5d1..ac47e84563ab 100644
--- a/pyfa.txt
+++ b/pyfa.txt
@@ -12,45 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync pyfa
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:picarica-overlay repo at '/var/lib/repo-mirror-ci/sync/picarica-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:plex-overlay repo at '/var/lib/repo-mirror-ci/sync/plex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing pyfa
-Cloning into '/var/lib/repo-mirror-ci/sync/pyfa'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced pyfa
* Sync succeeded
$ git log --format=%ci -1
diff --git a/python.html b/python.html
index d1d0a73c9575..40c8e122c67b 100644
--- a/python.html
+++ b/python.html
@@ -38,95 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync python
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync python
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing python
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pg_overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/pg_overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:plex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/plex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced python
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 python
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing python
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced python
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 python
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/python.txt b/python.txt
index 8131565550b3..dba880f2f86e 100644
--- a/python.txt
+++ b/python.txt
@@ -12,45 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/python.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync python
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pg_overlay repo at '/var/lib/repo-mirror-ci/sync/pg_overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:plex-overlay repo at '/var/lib/repo-mirror-ci/sync/plex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing python
-Cloning into '/var/lib/repo-mirror-ci/sync/python'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced python
* Sync succeeded
$ git log --format=%ci -1
diff --git a/qemu-init.html b/qemu-init.html
index cc933a2c8b0f..2872bde3a47e 100644
--- a/qemu-init.html
+++ b/qemu-init.html
@@ -40,87 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync qemu-init
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync qemu-init
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing qemu-init
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced qemu-init
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qemu-init
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing qemu-init
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced qemu-init
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qemu-init
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qemu-init.txt b/qemu-init.txt
index 50cf2286be32..a0320539bf10 100644
--- a/qemu-init.txt
+++ b/qemu-init.txt
@@ -13,41 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/kvm-tools.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync qemu-init
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing qemu-init
-Cloning into '/var/lib/repo-mirror-ci/sync/qemu-init'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced qemu-init
* Sync succeeded
$ git log --format=%ci -1
diff --git a/qgp.html b/qgp.html
index f7f2728befde..64a3439cc00a 100644
--- a/qgp.html
+++ b/qgp.html
@@ -36,87 +36,55 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qgp
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync qgp
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing qgp
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced qgp
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qgp
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing qgp
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced qgp
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qgp
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-cpp/google-benchmark-1.3.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-cpp/google-benchmark-1.3.0: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/qgp.txt b/qgp.txt
index 7f87028b90fe..13c8585588cb 100644
--- a/qgp.txt
+++ b/qgp.txt
@@ -11,40 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:qgp/gentoo-qgp.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync qgp
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing qgp
-Cloning into '/var/lib/repo-mirror-ci/sync/qgp'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced qgp
* Sync succeeded
$ git log --format=%ci -1
diff --git a/qownnotes-overlay.html b/qownnotes-overlay.html
index 956144703e37..719e837bcf83 100644
--- a/qownnotes-overlay.html
+++ b/qownnotes-overlay.html
@@ -36,85 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qownnotes-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync qownnotes-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing qownnotes-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced qownnotes-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qownnotes-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing qownnotes-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced qownnotes-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qownnotes-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qownnotes-overlay.txt b/qownnotes-overlay.txt
index 5a9625b5dee1..b7058435c135 100644
--- a/qownnotes-overlay.txt
+++ b/qownnotes-overlay.txt
@@ -11,40 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/qownnotes/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync qownnotes-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing qownnotes-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/qownnotes-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced qownnotes-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/qsx.html b/qsx.html
index 7d702026fff4..d21ffa6d7885 100644
--- a/qsx.html
+++ b/qsx.html
@@ -36,89 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync qsx
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync qsx
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing qsx
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced qsx
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qsx
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing qsx
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced qsx
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qsx
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qsx.txt b/qsx.txt
index b8418237a232..8a6a7d3631e3 100644
--- a/qsx.txt
+++ b/qsx.txt
@@ -11,42 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/qsuscs/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync qsx
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing qsx
-Cloning into '/var/lib/repo-mirror-ci/sync/qsx'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced qsx
* Sync succeeded
$ git log --format=%ci -1
diff --git a/qt.html b/qt.html
index 33a392bc3fd4..b5e9fa00a47e 100644
--- a/qt.html
+++ b/qt.html
@@ -42,93 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync qt
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync qt
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing qt
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:multilib-portage repo at &#x27;/var/lib/repo-mirror-ci/sync/multilib-portage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:musl repo at &#x27;/var/lib/repo-mirror-ci/sync/musl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:pkalin repo at &#x27;/var/lib/repo-mirror-ci/sync/pkalin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ppfeufer-gentoo-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced qt
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qt
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing qt
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced qt
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 qt
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/qt.txt b/qt.txt
index e226e81ded7c..a3229652c587 100644
--- a/qt.txt
+++ b/qt.txt
@@ -14,44 +14,24 @@
{'type': 'git', 'uri': 'git://anongit.gentoo.org/proj/qt.git'},
{'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/qt.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync qt
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:multilib-portage repo at '/var/lib/repo-mirror-ci/sync/multilib-portage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pkalin repo at '/var/lib/repo-mirror-ci/sync/pkalin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ppfeufer-gentoo-overlay repo at '/var/lib/repo-mirror-ci/sync/ppfeufer-gentoo-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing qt
-Cloning into '/var/lib/repo-mirror-ci/sync/qt'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced qt
* Sync succeeded
$ git log --format=%ci -1
diff --git a/quarks.html b/quarks.html
index 69b0c4a25636..1a47f1be18ec 100644
--- a/quarks.html
+++ b/quarks.html
@@ -32,91 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync quarks
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync quarks
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing quarks
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced quarks
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 quarks
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qgp repo at &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing quarks
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced quarks
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 quarks
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/quarks.txt b/quarks.txt
index 47edd2334a17..ee1d22f51c6a 100644
--- a/quarks.txt
+++ b/quarks.txt
@@ -9,43 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://git.zero-downtime.net/quark/quarks.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync quarks
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qgp repo at '/var/lib/repo-mirror-ci/sync/qgp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing quarks
-Cloning into '/var/lib/repo-mirror-ci/sync/quarks'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced quarks
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rafaelmartins.html b/rafaelmartins.html
index b572dd7da840..31bb33aceeaf 100644
--- a/rafaelmartins.html
+++ b/rafaelmartins.html
@@ -36,93 +36,57 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rafaelmartins
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rafaelmartins
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing rafaelmartins
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced rafaelmartins
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rafaelmartins
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qgp repo at &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing rafaelmartins
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced rafaelmartins
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rafaelmartins
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-portage/distpatch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-portage/distpatch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-dns/dnsimple-dyndns-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-dns/dnsimple-dyndns-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/rafaelmartins.txt b/rafaelmartins.txt
index ae9e18795e11..fc995fd21df2 100644
--- a/rafaelmartins.txt
+++ b/rafaelmartins.txt
@@ -11,42 +11,24 @@
{'type': 'git',
'uri': 'git://github.com/rafaelmartins/gentoo-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync rafaelmartins
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qgp repo at '/var/lib/repo-mirror-ci/sync/qgp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rafaelmartins
-Cloning into '/var/lib/repo-mirror-ci/sync/rafaelmartins'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rafaelmartins
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rage.html b/rage.html
index 393f87d3c2e0..6add5b691e75 100644
--- a/rage.html
+++ b/rage.html
@@ -34,93 +34,55 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync rage
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rage
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing rage
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:powerman repo at &#x27;/var/lib/repo-mirror-ci/sync/powerman&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:pross repo at &#x27;/var/lib/repo-mirror-ci/sync/pross&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:pyfa repo at &#x27;/var/lib/repo-mirror-ci/sync/pyfa&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced rage
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rage
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qgp repo at &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing rage
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced rage
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rage
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * media-fonts/ocr-a-1.0: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * media-fonts/ocr-a-1.0: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/rage.txt b/rage.txt
index a636a0524434..f865da922e85 100644
--- a/rage.txt
+++ b/rage.txt
@@ -10,43 +10,24 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/oxr463/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rage
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:powerman repo at '/var/lib/repo-mirror-ci/sync/powerman', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pross repo at '/var/lib/repo-mirror-ci/sync/pross', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pyfa repo at '/var/lib/repo-mirror-ci/sync/pyfa', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qgp repo at '/var/lib/repo-mirror-ci/sync/qgp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rage
-Cloning into '/var/lib/repo-mirror-ci/sync/rage'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rage
* Sync succeeded
$ git log --format=%ci -1
diff --git a/raiagent.html b/raiagent.html
index 19ca5bfa06af..7ee34c9450e6 100644
--- a/raiagent.html
+++ b/raiagent.html
@@ -32,99 +32,61 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync raiagent
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync raiagent
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing raiagent
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:pigfoot repo at &#x27;/var/lib/repo-mirror-ci/sync/pigfoot&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced raiagent
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 raiagent
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rafaelmartins repo at &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing raiagent
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced raiagent
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 raiagent
-</pre></td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-lyx/elyxer-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * app-lyx/elyxer-1.2.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-text/labelnation-1.218: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-text/labelnation-1.218: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-fonts/powerline-fonts-9999-r2: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-fonts/powerline-fonts-9999-r2: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * media-fonts/powerline-symbols-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-fonts/powerline-symbols-9999: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/raiagent.txt b/raiagent.txt
index bfecad292ffb..c25f49d9fac6 100644
--- a/raiagent.txt
+++ b/raiagent.txt
@@ -9,43 +9,24 @@
'source': [{'type': 'git', 'uri': 'https://github.com/leycec/raiagent'},
{'type': 'git', 'uri': 'git://github.com/leycec/raiagent.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync raiagent
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rafaelmartins repo at '/var/lib/repo-mirror-ci/sync/rafaelmartins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing raiagent
-Cloning into '/var/lib/repo-mirror-ci/sync/raiagent'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced raiagent
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rasdark.html b/rasdark.html
index e4623ce026c9..0d3c5880b7ed 100644
--- a/rasdark.html
+++ b/rasdark.html
@@ -30,93 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rasdark
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync rasdark
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing rasdark
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qgp repo at &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qsx repo at &#x27;/var/lib/repo-mirror-ci/sync/qsx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rasdark
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rasdark
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing rasdark
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced rasdark
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rasdark
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/rasdark.txt b/rasdark.txt
index d62043964fe5..9cbf29a91019 100644
--- a/rasdark.txt
+++ b/rasdark.txt
@@ -8,44 +8,24 @@
'source': [{'type': 'git', 'uri': 'https://github.com/rasdark/overlay'},
{'type': 'git', 'uri': 'git://github.com/rasdark/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rasdark
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qgp repo at '/var/lib/repo-mirror-ci/sync/qgp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qsx repo at '/var/lib/repo-mirror-ci/sync/qsx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rasdark
-Cloning into '/var/lib/repo-mirror-ci/sync/rasdark'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rasdark
* Sync succeeded
$ git log --format=%ci -1
diff --git a/raw.html b/raw.html
index 6134ee15ebc1..e4ac605261d2 100644
--- a/raw.html
+++ b/raw.html
@@ -32,95 +32,57 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync raw
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync raw
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing raw
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rafaelmartins repo at &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced raw
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 raw
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing raw
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced raw
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 raw
-</pre></td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * sys-kernel/next-sources-9999: failed sourcing ebuild: /var/lib/repo-mirror-ci/repos/raw/eclass/kernel-2.eclass: line 81: no match: /usr/share/genpnprd/*.-use
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * sys-kernel/next-sources-9999: failed sourcing ebuild: /var/lib/repo-mirror-ci/repos/raw/eclass/kernel-2.eclass: line 81: no match: /usr/share/genpnprd/*.-use
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * sys-kernel/torvalds-sources-9999: failed sourcing ebuild: /var/lib/repo-mirror-ci/repos/raw/eclass/kernel-2.eclass: line 81: no match: /usr/share/genpnprd/*.-use
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * sys-kernel/torvalds-sources-9999: failed sourcing ebuild: /var/lib/repo-mirror-ci/repos/raw/eclass/kernel-2.eclass: line 81: no match: /usr/share/genpnprd/*.-use
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/raw.txt b/raw.txt
index 50b2bc9b6b73..09bd25bcc63a 100644
--- a/raw.txt
+++ b/raw.txt
@@ -9,43 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/mahatma-kaganovich/raw.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync raw
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rafaelmartins repo at '/var/lib/repo-mirror-ci/sync/rafaelmartins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing raw
-Cloning into '/var/lib/repo-mirror-ci/sync/raw'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced raw
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rdnetto-overlay.html b/rdnetto-overlay.html
index 662147c58b55..ccccb9ff6d1a 100644
--- a/rdnetto-overlay.html
+++ b/rdnetto-overlay.html
@@ -36,105 +36,65 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rdnetto-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rdnetto-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing rdnetto-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:rafaelmartins repo at &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced rdnetto-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rdnetto-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing rdnetto-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced rdnetto-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rdnetto-overlay
-</pre></td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-text/pandoc-2.5: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-text/pandoc-2.5: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-text/pandoc-2.6: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/pandoc-2.6: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-text/pandoc-2.7: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/pandoc-2.7: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-text/pandoc-2.7.1: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-text/pandoc-2.7.1: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-text/pandoc-2.7.2: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-text/pandoc-2.7.2: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * app-text/pandoc-2.7.3: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-text/pandoc-2.7.3: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/rdnetto-overlay.txt b/rdnetto-overlay.txt
index 3b829f0ca111..c8dbd2523c7b 100644
--- a/rdnetto-overlay.txt
+++ b/rdnetto-overlay.txt
@@ -11,44 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:rdnetto/rdnetto-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rdnetto-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rafaelmartins repo at '/var/lib/repo-mirror-ci/sync/rafaelmartins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rdnetto-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/rdnetto-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rdnetto-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/reagentoo.html b/reagentoo.html
index 523dade53648..714743ff976c 100644
--- a/reagentoo.html
+++ b/reagentoo.html
@@ -32,91 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync reagentoo
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync reagentoo
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing reagentoo
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rafaelmartins repo at &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced reagentoo
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 reagentoo
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing reagentoo
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced reagentoo
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 reagentoo
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/reagentoo.txt b/reagentoo.txt
index 70e213846c37..ee1f45ae85e6 100644
--- a/reagentoo.txt
+++ b/reagentoo.txt
@@ -9,43 +9,24 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync reagentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rafaelmartins repo at '/var/lib/repo-mirror-ci/sync/rafaelmartins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing reagentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/reagentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced reagentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ricerlay.html b/ricerlay.html
index 77f84c1efd67..4391a25e7a1f 100644
--- a/ricerlay.html
+++ b/ricerlay.html
@@ -30,93 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ricerlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ricerlay
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ricerlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:phackerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/phackerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:pixlra repo at &#x27;/var/lib/repo-mirror-ci/sync/pixlra&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qgp repo at &#x27;/var/lib/repo-mirror-ci/sync/qgp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ricerlay
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rafaelmartins repo at &#x27;/var/lib/repo-mirror-ci/sync/rafaelmartins&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ricerlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing ricerlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced ricerlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ricerlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ricerlay.txt b/ricerlay.txt
index ff8d00771fee..6ddf440800aa 100644
--- a/ricerlay.txt
+++ b/ricerlay.txt
@@ -8,44 +8,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/azahi/ricerlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ricerlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pixlra repo at '/var/lib/repo-mirror-ci/sync/pixlra', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qgp repo at '/var/lib/repo-mirror-ci/sync/qgp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rafaelmartins repo at '/var/lib/repo-mirror-ci/sync/rafaelmartins', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ricerlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ricerlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ricerlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rich0.html b/rich0.html
index 811dffa53100..998c4bfa325f 100644
--- a/rich0.html
+++ b/rich0.html
@@ -30,89 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rich0
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync rich0
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing rich0
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rich0
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rich0
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing rich0
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced rich0
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rich0
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/rich0.txt b/rich0.txt
index 453f3779c19b..93afc143aafc 100644
--- a/rich0.txt
+++ b/rich0.txt
@@ -8,42 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/rich0/rich0-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync rich0
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rich0
-Cloning into '/var/lib/repo-mirror-ci/sync/rich0'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rich0
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ring-overlay.html b/ring-overlay.html
index c45ab71fbfd7..24156585f7d5 100644
--- a/ring-overlay.html
+++ b/ring-overlay.html
@@ -42,103 +42,65 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync ring-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync ring-overlay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing ring-overlay
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced ring-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ring-overlay
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing ring-overlay
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced ring-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ring-overlay
-</pre></td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-libs/opendht-1.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-libs/opendht-1.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-libs/opendht-1.8.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-libs/opendht-1.8.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * net-libs/opendht-1.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-libs/opendht-1.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * net-libs/opendht-1.9.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * net-libs/opendht-1.9.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * net-libs/opendht-1.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * net-libs/opendht-1.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-libs/opendht-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * net-libs/opendht-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/ring-overlay.txt b/ring-overlay.txt
index a2a01577054c..5e81e86a75d5 100644
--- a/ring-overlay.txt
+++ b/ring-overlay.txt
@@ -14,43 +14,24 @@
{'type': 'git',
'uri': 'git@github.com:stefan-langenmaier/ring-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ring-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ring-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ring-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ring-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rion.html b/rion.html
index fba7e08569bd..8a6b1ae56f46 100644
--- a/rion.html
+++ b/rion.html
@@ -38,105 +38,67 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rion
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync rion
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing rion
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:pentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/pentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:rage repo at &#x27;/var/lib/repo-mirror-ci/sync/rage&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced rion
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rion
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing rion
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced rion
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rion
-</pre></td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-text/makedict-0.4.1_beta1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/makedict-0.4.1_beta1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-text/makedict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-text/makedict-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-text/rst2epub-20120114: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-text/rst2epub-20120114: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-text/rst2epub-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-text/rst2epub-99999999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/rcore-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/rcore-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * net-misc/hermes-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * net-misc/hermes-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-apps/openwsman-2.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * sys-apps/openwsman-2.6.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/rion.txt b/rion.txt
index 8138f7a26f80..b51625718fb9 100644
--- a/rion.txt
+++ b/rion.txt
@@ -12,43 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/rion-overlay/rion-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rion
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:pentoo repo at '/var/lib/repo-mirror-ci/sync/pentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rage repo at '/var/lib/repo-mirror-ci/sync/rage', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rion
-Cloning into '/var/lib/repo-mirror-ci/sync/rion'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rion
* Sync succeeded
$ git log --format=%ci -1
diff --git a/riru.html b/riru.html
index 14cea8226e59..0be45a3fb32f 100644
--- a/riru.html
+++ b/riru.html
@@ -38,97 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync riru
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync riru
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing riru
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qownnotes-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/qownnotes-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:raiagent repo at &#x27;/var/lib/repo-mirror-ci/sync/raiagent&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced riru
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 riru
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:ring-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing riru
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced riru
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 riru
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/riru.txt b/riru.txt
index 0f306574053e..4675e6ed8e99 100644
--- a/riru.txt
+++ b/riru.txt
@@ -12,46 +12,24 @@
{'type': 'git', 'uri': 'git://github.com/pkulev/riru.git'},
{'type': 'git', 'uri': 'git@github.com:pkulev/riru.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync riru
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qownnotes-overlay repo at '/var/lib/repo-mirror-ci/sync/qownnotes-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raiagent repo at '/var/lib/repo-mirror-ci/sync/raiagent', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ring-overlay repo at '/var/lib/repo-mirror-ci/sync/ring-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing riru
-Cloning into '/var/lib/repo-mirror-ci/sync/riru'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced riru
* Sync succeeded
$ git log --format=%ci -1
diff --git a/robert7k.html b/robert7k.html
index 1b5fe4bb4f92..5cbefe23527c 100644
--- a/robert7k.html
+++ b/robert7k.html
@@ -28,97 +28,53 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync robert7k
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync robert7k
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing robert7k
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced robert7k
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robert7k
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ring-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing robert7k
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced robert7k
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robert7k
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/robert7k.txt b/robert7k.txt
index f3e01072d361..4b6a8aea9998 100644
--- a/robert7k.txt
+++ b/robert7k.txt
@@ -7,46 +7,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/robert7k/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync robert7k
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ring-overlay repo at '/var/lib/repo-mirror-ci/sync/ring-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing robert7k
-Cloning into '/var/lib/repo-mirror-ci/sync/robert7k'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced robert7k
* Sync succeeded
$ git log --format=%ci -1
diff --git a/robertgzr.html b/robertgzr.html
index 1835482263ed..ed2af3c1f202 100644
--- a/robertgzr.html
+++ b/robertgzr.html
@@ -32,97 +32,55 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync robertgzr
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync robertgzr
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing robertgzr
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced robertgzr
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robertgzr
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing robertgzr
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced robertgzr
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robertgzr
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * media-fonts/fira-go-1.001: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * media-fonts/fira-go-1.001: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/robertgzr.txt b/robertgzr.txt
index a91009f1a125..c4328d8a4a37 100644
--- a/robertgzr.txt
+++ b/robertgzr.txt
@@ -9,45 +9,24 @@
'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~robertgzr/portage'},
{'type': 'git', 'uri': 'ssh://git@git.sr.ht:~robertgzr/portage'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync robertgzr
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing robertgzr
-Cloning into '/var/lib/repo-mirror-ci/sync/robertgzr'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced robertgzr
* Sync succeeded
$ git log --format=%ci -1
diff --git a/roslin.html b/roslin.html
index 8d496149ffa9..3ced294de789 100644
--- a/roslin.html
+++ b/roslin.html
@@ -36,97 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync roslin
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync roslin
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing roslin
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ricerlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ricerlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced roslin
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 roslin
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:ring-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing roslin
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced roslin
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 roslin
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/roslin.txt b/roslin.txt
index b3fac3bdb19d..bec3e9f7c0b9 100644
--- a/roslin.txt
+++ b/roslin.txt
@@ -11,46 +11,24 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/roslin-uberlay/roslin.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync roslin
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ricerlay repo at '/var/lib/repo-mirror-ci/sync/ricerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ring-overlay repo at '/var/lib/repo-mirror-ci/sync/ring-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing roslin
-Cloning into '/var/lib/repo-mirror-ci/sync/roslin'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced roslin
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rpm.html b/rpm.html
index ac2d30046706..ad7ca7aa312e 100644
--- a/rpm.html
+++ b/rpm.html
@@ -30,165 +30,121 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync rpm
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync rpm
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing rpm
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced rpm
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ring-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rpm
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing rpm
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced rpm
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rpm
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-arch/rpm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * app-arch/rpm-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/bunch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * dev-python/bunch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/cccolutils-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/cccolutils-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-python/copr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-python/copr-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-python/dockerfile-parse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * dev-python/dockerfile-parse-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-python/kitchen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-python/kitchen-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-python/kobo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/kobo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-python/marshmallow-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/marshmallow-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-python/munch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/munch-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-python/offtrac-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/offtrac-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-python/osbs-client-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-python/osbs-client-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-python/pyroute2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-python/pyroute2-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-python/python-bugzilla-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-python/python-bugzilla-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-python/python-fedora-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-python/python-fedora-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-python/python-krbV-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-python/python-krbV-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-python/python-ptrace-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-python/python-ptrace-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-python/repoze-who-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-python/repoze-who-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-python/repoze-who-friendlyform-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-python/repoze-who-friendlyform-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-python/requests-kerberos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-python/requests-kerberos-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-python/urlgrabber-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-python/urlgrabber-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-util/bodhi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-util/bodhi-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-util/centpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-util/centpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-util/copr-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-util/copr-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-util/fedora-packager-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-util/fedora-packager-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-util/fedora-review-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-util/fedora-review-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-util/fedpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-util/fedpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * dev-util/koji-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-util/koji-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * dev-util/mock-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-util/mock-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * dev-util/packagedb-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-util/packagedb-cli-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * dev-util/rebase-helper-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-util/rebase-helper-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * dev-util/rpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-util/rpkg-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * dev-util/rpmdevtools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-util/rpmdevtools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * dev-util/rpmlint-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-util/rpmlint-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * dev-util/tito-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-util/tito-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/rpm.txt b/rpm.txt
index bb69511db540..a4932e7f3c2f 100644
--- a/rpm.txt
+++ b/rpm.txt
@@ -8,46 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/pavlix/gentoo-rpm.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rpm
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ring-overlay repo at '/var/lib/repo-mirror-ci/sync/ring-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rpm
-Cloning into '/var/lib/repo-mirror-ci/sync/rpm'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rpm
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ruby.html b/ruby.html
index be07ad715c13..188b2be3e7fe 100644
--- a/ruby.html
+++ b/ruby.html
@@ -40,95 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ruby
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync ruby
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing ruby
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:python repo at &#x27;/var/lib/repo-mirror-ci/sync/python&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:qemu-init repo at &#x27;/var/lib/repo-mirror-ci/sync/qemu-init&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:rdnetto-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/rdnetto-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced ruby
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ring-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/ring-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ruby
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing ruby
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced ruby
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ruby
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ruby.txt b/ruby.txt
index 3b8466495271..526f05d85599 100644
--- a/ruby.txt
+++ b/ruby.txt
@@ -13,45 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/ruby-overlay.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync ruby
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:python repo at '/var/lib/repo-mirror-ci/sync/python', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qemu-init repo at '/var/lib/repo-mirror-ci/sync/qemu-init', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rdnetto-overlay repo at '/var/lib/repo-mirror-ci/sync/rdnetto-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ring-overlay repo at '/var/lib/repo-mirror-ci/sync/ring-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ruby
-Cloning into '/var/lib/repo-mirror-ci/sync/ruby'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ruby
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rukruk.html b/rukruk.html
index c9b65fe0ec77..06c648016675 100644
--- a/rukruk.html
+++ b/rukruk.html
@@ -36,91 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rukruk
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync rukruk
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing rukruk
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced rukruk
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rukruk
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:rpm repo at &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing rukruk
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rukruk&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced rukruk
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rukruk
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/rukruk.txt b/rukruk.txt
index ed33eeec0f78..bfad32fcd854 100644
--- a/rukruk.txt
+++ b/rukruk.txt
@@ -11,43 +11,24 @@
{'type': 'git', 'uri': 'git://github.com/Atoms/rukruk.git'},
{'type': 'git', 'uri': 'git@github.com:Atoms/rukruk.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rukruk
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rpm repo at '/var/lib/repo-mirror-ci/sync/rpm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rukruk
-Cloning into '/var/lib/repo-mirror-ci/sync/rukruk'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rukruk
* Sync succeeded
$ git log --format=%ci -1
diff --git a/rust.html b/rust.html
index e0f2eab68097..c15991802820 100644
--- a/rust.html
+++ b/rust.html
@@ -34,91 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync rust
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync rust
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing rust
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced rust
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rust
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:rpm repo at &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing rust
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced rust
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 rust
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/rust.txt b/rust.txt
index 15254a7b3658..53707eb4e7df 100644
--- a/rust.txt
+++ b/rust.txt
@@ -10,43 +10,24 @@
{'type': 'git', 'uri': 'git://github.com/gentoo/gentoo-rust.git'},
{'type': 'git', 'uri': 'git@github.com:gentoo/gentoo-rust.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync rust
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rpm repo at '/var/lib/repo-mirror-ci/sync/rpm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing rust
-Cloning into '/var/lib/repo-mirror-ci/sync/rust'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced rust
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ryans.html b/ryans.html
index 8766905664a9..ec03b70c6939 100644
--- a/ryans.html
+++ b/ryans.html
@@ -30,93 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync ryans
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync ryans
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing ryans
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced ryans
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ryans
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:rpm repo at &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing ryans
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ryans&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced ryans
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ryans
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ryans.txt b/ryans.txt
index bd99b444f9a4..6410984a0d5c 100644
--- a/ryans.txt
+++ b/ryans.txt
@@ -8,44 +8,24 @@
'uri': 'https://github.com/bekcpear/ryans-repos.git'},
{'type': 'git', 'uri': 'git@github.com:bekcpear/ryans-repos.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ryans
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rpm repo at '/var/lib/repo-mirror-ci/sync/rpm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ryans
-Cloning into '/var/lib/repo-mirror-ci/sync/ryans'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ryans
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sabayon-distro.html b/sabayon-distro.html
index 1f2ff213519a..e24815f74bd1 100644
--- a/sabayon-distro.html
+++ b/sabayon-distro.html
@@ -34,301 +34,271 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sabayon-distro
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sabayon-distro
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sabayon-distro
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:rpm repo at &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sabayon-distro
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon-distro
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing sabayon-distro
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced sabayon-distro
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon-distro
-</pre></td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-crypt/pinentry-base-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * app-crypt/pinentry-base-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-crypt/pinentry-qt5-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * app-crypt/pinentry-qt5-1.1.0-r2: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-text/pastebunz-1.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-text/pastebunz-1.4-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-libs/libcec-raspberrypi-4.0.2-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * dev-libs/libcec-raspberrypi-4.0.2-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/ccxt-1.10.475: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-python/ccxt-1.10.475: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-python/ccxt-1.10.707: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-python/ccxt-1.10.707: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-python/shyaml-0.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-python/shyaml-0.5.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/shyaml-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-python/shyaml-0.6.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-vcs/subversion-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-vcs/subversion-1.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-vcs/subversion-1.12.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-vcs/subversion-1.12.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-tv/kodi-raspberrypi-16.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * media-tv/kodi-raspberrypi-17.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * media-tv/kodi-raspberrypi-17.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * net-dns/avahi-mono-0.7-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * net-dns/avahi-mono-0.7-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * net-p2p/bittorrent-4.4.0-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * net-p2p/bittorrent-4.4.0-r5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-apps/portage-2.3.69: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2*, (python-r1.eclass, line 332: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * sys-apps/portage-2.3.69: failed sourcing ebuild: No supported implementations match python_gen_usedep patterns: python2*, (python-r1.eclass, line 332: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * www-client/firefox-l10n-ach-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * www-client/firefox-l10n-ach-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * www-client/firefox-l10n-af-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * www-client/firefox-l10n-af-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * www-client/firefox-l10n-an-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * www-client/firefox-l10n-an-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * www-client/firefox-l10n-ar-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * www-client/firefox-l10n-ar-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * www-client/firefox-l10n-ast-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * www-client/firefox-l10n-ast-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * www-client/firefox-l10n-az-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * www-client/firefox-l10n-az-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * www-client/firefox-l10n-be-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * www-client/firefox-l10n-be-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * www-client/firefox-l10n-bg-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * www-client/firefox-l10n-bg-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * www-client/firefox-l10n-bn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * www-client/firefox-l10n-bn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * www-client/firefox-l10n-br-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * www-client/firefox-l10n-br-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * www-client/firefox-l10n-bs-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * www-client/firefox-l10n-bs-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * www-client/firefox-l10n-ca-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * www-client/firefox-l10n-ca-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * www-client/firefox-l10n-cak-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * www-client/firefox-l10n-cak-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * www-client/firefox-l10n-cs-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * www-client/firefox-l10n-cs-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * www-client/firefox-l10n-cy-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * www-client/firefox-l10n-cy-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * www-client/firefox-l10n-da-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * www-client/firefox-l10n-da-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * www-client/firefox-l10n-de-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * www-client/firefox-l10n-de-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * www-client/firefox-l10n-dsb-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * www-client/firefox-l10n-dsb-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * www-client/firefox-l10n-el-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * www-client/firefox-l10n-el-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * www-client/firefox-l10n-en-CA-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * www-client/firefox-l10n-en-CA-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * www-client/firefox-l10n-en-GB-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * www-client/firefox-l10n-en-GB-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * www-client/firefox-l10n-eo-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * www-client/firefox-l10n-eo-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * www-client/firefox-l10n-es-AR-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * www-client/firefox-l10n-es-AR-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * www-client/firefox-l10n-es-CL-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * www-client/firefox-l10n-es-CL-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * www-client/firefox-l10n-es-ES-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * www-client/firefox-l10n-es-ES-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * www-client/firefox-l10n-es-MX-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * www-client/firefox-l10n-es-MX-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * www-client/firefox-l10n-et-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * www-client/firefox-l10n-et-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * www-client/firefox-l10n-eu-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * www-client/firefox-l10n-eu-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * www-client/firefox-l10n-fa-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * www-client/firefox-l10n-fa-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * www-client/firefox-l10n-ff-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * www-client/firefox-l10n-ff-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * www-client/firefox-l10n-fi-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * www-client/firefox-l10n-fi-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * www-client/firefox-l10n-fr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * www-client/firefox-l10n-fr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * www-client/firefox-l10n-fy-NL-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * www-client/firefox-l10n-fy-NL-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * www-client/firefox-l10n-ga-IE-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * www-client/firefox-l10n-ga-IE-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * www-client/firefox-l10n-gd-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * www-client/firefox-l10n-gd-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * www-client/firefox-l10n-gl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * www-client/firefox-l10n-gl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> * www-client/firefox-l10n-gn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * www-client/firefox-l10n-gn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> * www-client/firefox-l10n-gu-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * www-client/firefox-l10n-gu-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> * www-client/firefox-l10n-he-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * www-client/firefox-l10n-he-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> * www-client/firefox-l10n-hi-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * www-client/firefox-l10n-hi-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> * www-client/firefox-l10n-hr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * www-client/firefox-l10n-hr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * www-client/firefox-l10n-hsb-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * www-client/firefox-l10n-hsb-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> * www-client/firefox-l10n-hu-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * www-client/firefox-l10n-hu-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> * www-client/firefox-l10n-hy-AM-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * www-client/firefox-l10n-hy-AM-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> * www-client/firefox-l10n-ia-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * www-client/firefox-l10n-ia-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * www-client/firefox-l10n-id-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * www-client/firefox-l10n-id-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> * www-client/firefox-l10n-is-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * www-client/firefox-l10n-is-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> * www-client/firefox-l10n-it-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * www-client/firefox-l10n-it-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> * www-client/firefox-l10n-ja-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * www-client/firefox-l10n-ja-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> * www-client/firefox-l10n-ka-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * www-client/firefox-l10n-ka-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> * www-client/firefox-l10n-kab-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * www-client/firefox-l10n-kab-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> * www-client/firefox-l10n-kk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> * www-client/firefox-l10n-kk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> * www-client/firefox-l10n-km-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> * www-client/firefox-l10n-km-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> * www-client/firefox-l10n-kn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> * www-client/firefox-l10n-kn-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> * www-client/firefox-l10n-ko-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> * www-client/firefox-l10n-ko-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * www-client/firefox-l10n-lij-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> * www-client/firefox-l10n-lij-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> * www-client/firefox-l10n-lt-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l108"><td><a href="#l108"><span>108</span></a></td><td><pre> * www-client/firefox-l10n-lt-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> * www-client/firefox-l10n-lv-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l109"><td><a href="#l109"><span>109</span></a></td><td><pre> * www-client/firefox-l10n-lv-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> * www-client/firefox-l10n-mk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l110"><td><a href="#l110"><span>110</span></a></td><td><pre> * www-client/firefox-l10n-mk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> * www-client/firefox-l10n-mr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l111"><td><a href="#l111"><span>111</span></a></td><td><pre> * www-client/firefox-l10n-mr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> * www-client/firefox-l10n-ms-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l112"><td><a href="#l112"><span>112</span></a></td><td><pre> * www-client/firefox-l10n-ms-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> * www-client/firefox-l10n-my-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l113"><td><a href="#l113"><span>113</span></a></td><td><pre> * www-client/firefox-l10n-my-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> * www-client/firefox-l10n-nb-NO-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l114"><td><a href="#l114"><span>114</span></a></td><td><pre> * www-client/firefox-l10n-nb-NO-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> * www-client/firefox-l10n-nl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l115"><td><a href="#l115"><span>115</span></a></td><td><pre> * www-client/firefox-l10n-nl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> * www-client/firefox-l10n-nn-NO-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l116"><td><a href="#l116"><span>116</span></a></td><td><pre> * www-client/firefox-l10n-nn-NO-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> * www-client/firefox-l10n-oc-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l117"><td><a href="#l117"><span>117</span></a></td><td><pre> * www-client/firefox-l10n-oc-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> * www-client/firefox-l10n-pa-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l118"><td><a href="#l118"><span>118</span></a></td><td><pre> * www-client/firefox-l10n-pa-IN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> * www-client/firefox-l10n-pl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l119"><td><a href="#l119"><span>119</span></a></td><td><pre> * www-client/firefox-l10n-pl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> * www-client/firefox-l10n-pt-BR-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l120"><td><a href="#l120"><span>120</span></a></td><td><pre> * www-client/firefox-l10n-pt-BR-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> * www-client/firefox-l10n-pt-PT-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l121"><td><a href="#l121"><span>121</span></a></td><td><pre> * www-client/firefox-l10n-pt-PT-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> * www-client/firefox-l10n-rm-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l122"><td><a href="#l122"><span>122</span></a></td><td><pre> * www-client/firefox-l10n-rm-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> * www-client/firefox-l10n-ro-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l123"><td><a href="#l123"><span>123</span></a></td><td><pre> * www-client/firefox-l10n-ro-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> * www-client/firefox-l10n-ru-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l124"><td><a href="#l124"><span>124</span></a></td><td><pre> * www-client/firefox-l10n-ru-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> * www-client/firefox-l10n-si-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l125"><td><a href="#l125"><span>125</span></a></td><td><pre> * www-client/firefox-l10n-si-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> * www-client/firefox-l10n-sk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l126"><td><a href="#l126"><span>126</span></a></td><td><pre> * www-client/firefox-l10n-sk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> * www-client/firefox-l10n-sl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l127"><td><a href="#l127"><span>127</span></a></td><td><pre> * www-client/firefox-l10n-sl-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> * www-client/firefox-l10n-son-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l128"><td><a href="#l128"><span>128</span></a></td><td><pre> * www-client/firefox-l10n-son-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> * www-client/firefox-l10n-sq-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l129"><td><a href="#l129"><span>129</span></a></td><td><pre> * www-client/firefox-l10n-sq-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> * www-client/firefox-l10n-sr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l130"><td><a href="#l130"><span>130</span></a></td><td><pre> * www-client/firefox-l10n-sr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l146"><td><a href="#l146"><span>146</span></a></td><td><pre> * www-client/firefox-l10n-sv-SE-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l131"><td><a href="#l131"><span>131</span></a></td><td><pre> * www-client/firefox-l10n-sv-SE-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l147"><td><a href="#l147"><span>147</span></a></td><td><pre> * www-client/firefox-l10n-ta-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l132"><td><a href="#l132"><span>132</span></a></td><td><pre> * www-client/firefox-l10n-ta-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l148"><td><a href="#l148"><span>148</span></a></td><td><pre> * www-client/firefox-l10n-te-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l133"><td><a href="#l133"><span>133</span></a></td><td><pre> * www-client/firefox-l10n-te-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l149"><td><a href="#l149"><span>149</span></a></td><td><pre> * www-client/firefox-l10n-th-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l134"><td><a href="#l134"><span>134</span></a></td><td><pre> * www-client/firefox-l10n-th-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l150"><td><a href="#l150"><span>150</span></a></td><td><pre> * www-client/firefox-l10n-tr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l135"><td><a href="#l135"><span>135</span></a></td><td><pre> * www-client/firefox-l10n-tr-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l151"><td><a href="#l151"><span>151</span></a></td><td><pre> * www-client/firefox-l10n-uk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l136"><td><a href="#l136"><span>136</span></a></td><td><pre> * www-client/firefox-l10n-uk-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l152"><td><a href="#l152"><span>152</span></a></td><td><pre> * www-client/firefox-l10n-ur-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l137"><td><a href="#l137"><span>137</span></a></td><td><pre> * www-client/firefox-l10n-ur-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l153"><td><a href="#l153"><span>153</span></a></td><td><pre> * www-client/firefox-l10n-uz-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l138"><td><a href="#l138"><span>138</span></a></td><td><pre> * www-client/firefox-l10n-uz-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l154"><td><a href="#l154"><span>154</span></a></td><td><pre> * www-client/firefox-l10n-vi-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l139"><td><a href="#l139"><span>139</span></a></td><td><pre> * www-client/firefox-l10n-vi-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l155"><td><a href="#l155"><span>155</span></a></td><td><pre> * www-client/firefox-l10n-xh-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l140"><td><a href="#l140"><span>140</span></a></td><td><pre> * www-client/firefox-l10n-xh-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l156"><td><a href="#l156"><span>156</span></a></td><td><pre> * www-client/firefox-l10n-zh-CN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l141"><td><a href="#l141"><span>141</span></a></td><td><pre> * www-client/firefox-l10n-zh-CN-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l157"><td><a href="#l157"><span>157</span></a></td><td><pre> * www-client/firefox-l10n-zh-TW-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
+ <tr class="err" id="l142"><td><a href="#l142"><span>142</span></a></td><td><pre> * www-client/firefox-l10n-zh-TW-84.0: failed sourcing ebuild: EAPI 4 is not supported, contact eclass maintainers, (mozlinguas-v2.eclass, line 25: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l158"><td><a href="#l158"><span>158</span></a></td><td><pre> * x11-misc/lightdm-base-1.28.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l143"><td><a href="#l143"><span>143</span></a></td><td><pre> * x11-misc/lightdm-base-1.28.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l159"><td><a href="#l159"><span>159</span></a></td><td><pre> * x11-misc/lightdm-qt5-1.28.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
+ <tr class="err" id="l144"><td><a href="#l144"><span>144</span></a></td><td><pre> * x11-misc/lightdm-qt5-1.28.0: failed sourcing ebuild: EAPI=6 is not supported, (qmake-utils.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l160"><td><a href="#l160"><span>160</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l145"><td><a href="#l145"><span>145</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/sabayon-distro.txt b/sabayon-distro.txt
index 6200eb07c885..fc42f84ac828 100644
--- a/sabayon-distro.txt
+++ b/sabayon-distro.txt
@@ -10,39 +10,24 @@
'source': [{'type': 'git',
'uri': 'git://github.com/Sabayon/sabayon-distro.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sabayon-distro
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rpm repo at '/var/lib/repo-mirror-ci/sync/rpm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sabayon-distro
-Cloning into '/var/lib/repo-mirror-ci/sync/sabayon-distro'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sabayon-distro
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sabayon.html b/sabayon.html
index f24d6d5c2635..502fd745cc81 100644
--- a/sabayon.html
+++ b/sabayon.html
@@ -38,163 +38,127 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sabayon
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sabayon
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sabayon
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental-snapshots repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:quarks repo at &#x27;/var/lib/repo-mirror-ci/sync/quarks&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:rasdark repo at &#x27;/var/lib/repo-mirror-ci/sync/rasdark&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:reagentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/reagentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rich0 repo at &#x27;/var/lib/repo-mirror-ci/sync/rich0&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:riru repo at &#x27;/var/lib/repo-mirror-ci/sync/riru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:robert7k repo at &#x27;/var/lib/repo-mirror-ci/sync/robert7k&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sabayon
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:rpm repo at &#x27;/var/lib/repo-mirror-ci/sync/rpm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing sabayon
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced sabayon
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sabayon
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-admin/authconfig-6.2.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-admin/authconfig-6.2.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-admin/authconfig-7.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-admin/authconfig-7.0.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-admin/authconfig-7.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-admin/authconfig-7.0.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-admin/equo-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-admin/equo-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-admin/equo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-admin/equo-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-admin/matter-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-admin/matter-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * app-admin/rigo-320: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-admin/rigo-320: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * app-admin/rigo-322: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-admin/rigo-322: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * app-admin/rigo-323: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-admin/rigo-323: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * app-admin/rigo-324-r2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-admin/rigo-324-r2: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * app-i18n/langtable-0.0.41: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-i18n/langtable-0.0.41: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * app-i18n/langtable-0.0.42: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-i18n/langtable-0.0.42: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * app-i18n/langtable-0.0.43: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-i18n/langtable-0.0.43: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * app-misc/kupfer-319: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-misc/kupfer-319: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * app-misc/magneto-loader-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-misc/magneto-loader-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * app-misc/magneto-loader-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-misc/magneto-loader-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-python/oursql-0.9.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-python/oursql-0.9.3.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-python/pylons-1.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-python/pylons-1.0.1-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * kde-misc/magneto-kde-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * kde-misc/magneto-kde-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * kde-misc/magneto-kde-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * kde-misc/magneto-kde-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * media-sound/idjc-0.8.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * media-sound/idjc-0.8.14: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * net-libs/libturpial-1.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-libs/libturpial-1.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * net-libs/libturpial-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-libs/libturpial-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * sys-apps/entropy-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * sys-apps/entropy-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * sys-apps/entropy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * sys-apps/entropy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * sys-apps/entropy-server-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * sys-apps/entropy-server-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * sys-apps/entropy-server-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * sys-apps/entropy-server-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * sys-apps/magneto-core-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * sys-apps/magneto-core-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * sys-apps/magneto-core-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * sys-apps/magneto-core-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * sys-apps/rigo-daemon-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * sys-apps/rigo-daemon-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * sys-apps/rigo-daemon-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * sys-apps/rigo-daemon-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * x11-misc/magneto-gtk-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * x11-misc/magneto-gtk-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * x11-misc/magneto-gtk-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * x11-misc/magneto-gtk-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * x11-misc/magneto-gtk-323: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * x11-misc/magneto-gtk-323: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * x11-misc/magneto-gtk-324-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * x11-misc/magneto-gtk-324-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * x11-misc/magneto-gtk3-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * x11-misc/magneto-gtk3-320: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * x11-misc/magneto-gtk3-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * x11-misc/magneto-gtk3-322: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/sabayon.txt b/sabayon.txt
index 54070734b316..72b82c74b012 100644
--- a/sabayon.txt
+++ b/sabayon.txt
@@ -12,42 +12,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/Sabayon/for-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sabayon
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:mv repo at '/var/lib/repo-mirror-ci/sync/mv', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental-snapshots repo at '/var/lib/repo-mirror-ci/sync/perl-experimental-snapshots', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:quarks repo at '/var/lib/repo-mirror-ci/sync/quarks', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rasdark repo at '/var/lib/repo-mirror-ci/sync/rasdark', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:reagentoo repo at '/var/lib/repo-mirror-ci/sync/reagentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rich0 repo at '/var/lib/repo-mirror-ci/sync/rich0', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:riru repo at '/var/lib/repo-mirror-ci/sync/riru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robert7k repo at '/var/lib/repo-mirror-ci/sync/robert7k', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rpm repo at '/var/lib/repo-mirror-ci/sync/rpm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sabayon
-Cloning into '/var/lib/repo-mirror-ci/sync/sabayon'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sabayon
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sage-on-gentoo.html b/sage-on-gentoo.html
index a7933f5a58d8..b954147a4c8a 100644
--- a/sage-on-gentoo.html
+++ b/sage-on-gentoo.html
@@ -36,83 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sage-on-gentoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sage-on-gentoo
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sage-on-gentoo
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rukruk repo at &#x27;/var/lib/repo-mirror-ci/sync/rukruk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ryans repo at &#x27;/var/lib/repo-mirror-ci/sync/ryans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sage-on-gentoo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sage-on-gentoo
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing sage-on-gentoo
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced sage-on-gentoo
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sage-on-gentoo
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sage-on-gentoo.txt b/sage-on-gentoo.txt
index 4510229e476b..6a422c0598c4 100644
--- a/sage-on-gentoo.txt
+++ b/sage-on-gentoo.txt
@@ -11,39 +11,24 @@
{'type': 'git',
'uri': 'https://github.com/cschwan/sage-on-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sage-on-gentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rukruk repo at '/var/lib/repo-mirror-ci/sync/rukruk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ryans repo at '/var/lib/repo-mirror-ci/sync/ryans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sage-on-gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/sage-on-gentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sage-on-gentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/salfter.html b/salfter.html
index fc18c8cd4fbc..60c6b1abd76f 100644
--- a/salfter.html
+++ b/salfter.html
@@ -28,83 +28,53 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync salfter
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync salfter
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>*** syncing salfter
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rukruk repo at &#x27;/var/lib/repo-mirror-ci/sync/rukruk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ryans repo at &#x27;/var/lib/repo-mirror-ci/sync/ryans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>*** synced salfter
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 salfter
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** syncing salfter
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;...
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced salfter
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 salfter
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/salfter.txt b/salfter.txt
index 6d6491fd7dfe..f4bca5f9532b 100644
--- a/salfter.txt
+++ b/salfter.txt
@@ -7,39 +7,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://gitlab.com/salfter/portage.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync salfter
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rukruk repo at '/var/lib/repo-mirror-ci/sync/rukruk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ryans repo at '/var/lib/repo-mirror-ci/sync/ryans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing salfter
-Cloning into '/var/lib/repo-mirror-ci/sync/salfter'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced salfter
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sam_c.html b/sam_c.html
index 13a54b69b500..0c361a8dbddb 100644
--- a/sam_c.html
+++ b/sam_c.html
@@ -30,85 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync sam_c
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync sam_c
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing sam_c
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rukruk repo at &#x27;/var/lib/repo-mirror-ci/sync/rukruk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ryans repo at &#x27;/var/lib/repo-mirror-ci/sync/ryans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced sam_c
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sam_c
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing sam_c
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced sam_c
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sam_c
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sam_c.txt b/sam_c.txt
index 344e8c42244e..3e6a0fe25d0a 100644
--- a/sam_c.txt
+++ b/sam_c.txt
@@ -8,40 +8,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/thesamesam/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sam_c
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rukruk repo at '/var/lib/repo-mirror-ci/sync/rukruk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ryans repo at '/var/lib/repo-mirror-ci/sync/ryans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sam_c
-Cloning into '/var/lib/repo-mirror-ci/sync/sam_c'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sam_c
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sarnex-overlay.html b/sarnex-overlay.html
index 5ca08b1bcbb2..398bf11449d2 100644
--- a/sarnex-overlay.html
+++ b/sarnex-overlay.html
@@ -36,83 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sarnex-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sarnex-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sarnex-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:raw repo at &#x27;/var/lib/repo-mirror-ci/sync/raw&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:rion repo at &#x27;/var/lib/repo-mirror-ci/sync/rion&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:robertgzr repo at &#x27;/var/lib/repo-mirror-ci/sync/robertgzr&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:rukruk repo at &#x27;/var/lib/repo-mirror-ci/sync/rukruk&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ryans repo at &#x27;/var/lib/repo-mirror-ci/sync/ryans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sarnex-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sarnex-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing sarnex-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced sarnex-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sarnex-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sarnex-overlay.txt b/sarnex-overlay.txt
index 23a05f4657b2..89dc1f761211 100644
--- a/sarnex-overlay.txt
+++ b/sarnex-overlay.txt
@@ -11,39 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/sarnex/sarnex-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sarnex-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:raw repo at '/var/lib/repo-mirror-ci/sync/raw', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rion repo at '/var/lib/repo-mirror-ci/sync/rion', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:robertgzr repo at '/var/lib/repo-mirror-ci/sync/robertgzr', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rukruk repo at '/var/lib/repo-mirror-ci/sync/rukruk', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ryans repo at '/var/lib/repo-mirror-ci/sync/ryans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sarnex-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/sarnex-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sarnex-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sattvik.html b/sattvik.html
index c4a614720131..ae4bc1cd3e50 100644
--- a/sattvik.html
+++ b/sattvik.html
@@ -40,79 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sattvik
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sattvik
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sattvik
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced sattvik
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sattvik
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing sattvik
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced sattvik
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sattvik
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sattvik.txt b/sattvik.txt
index 8d990ea8c302..67a6660097fc 100644
--- a/sattvik.txt
+++ b/sattvik.txt
@@ -13,37 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/sattvik.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sattvik
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sattvik
-Cloning into '/var/lib/repo-mirror-ci/sync/sattvik'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sattvik
* Sync succeeded
$ git log --format=%ci -1
diff --git a/science.html b/science.html
index 0e16fe435d09..2154cdf0d4ff 100644
--- a/science.html
+++ b/science.html
@@ -64,79 +64,53 @@
</pre></td></tr>
<tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint sync science
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint sync science
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** syncing science
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced science
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing science
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced science
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 science
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/science.txt b/science.txt
index 59449f0252fd..9d78cb4e0712 100644
--- a/science.txt
+++ b/science.txt
@@ -25,37 +25,24 @@
{'type': 'git', 'uri': 'git://github.com/gentoo-science/sci.git'},
{'type': 'git', 'uri': 'git@github.com:gentoo-science/sci.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync science
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing science
-Cloning into '/var/lib/repo-mirror-ci/sync/science'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced science
* Sync succeeded
$ git log --format=%ci -1
diff --git a/scrill.html b/scrill.html
index 0e43412e32b3..ede2a8a50222 100644
--- a/scrill.html
+++ b/scrill.html
@@ -32,81 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync scrill
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync scrill
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing scrill
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:rust repo at &#x27;/var/lib/repo-mirror-ci/sync/rust&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced scrill
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 scrill
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing scrill
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced scrill
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 scrill
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/scrill.txt b/scrill.txt
index 5d1b0d9138b5..1f744cca65e8 100644
--- a/scrill.txt
+++ b/scrill.txt
@@ -9,38 +9,24 @@
'source': [{'type': 'git',
'uri': 'git://github.com/scrill/scrill-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync scrill
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:rust repo at '/var/lib/repo-mirror-ci/sync/rust', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing scrill
-Cloning into '/var/lib/repo-mirror-ci/sync/scrill'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced scrill
* Sync succeeded
$ git log --format=%ci -1
diff --git a/seden.html b/seden.html
index 0b0b1e1e179c..4df4645eea2d 100644
--- a/seden.html
+++ b/seden.html
@@ -38,81 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync seden
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync seden
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing seden
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced seden
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 seden
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing seden
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced seden
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 seden
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/seden.txt b/seden.txt
index a0e5bcc24310..54f526b06019 100644
--- a/seden.txt
+++ b/seden.txt
@@ -12,38 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/seden.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync seden
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing seden
-Cloning into '/var/lib/repo-mirror-ci/sync/seden'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced seden
* Sync succeeded
$ git log --format=%ci -1
diff --git a/setkeh.html b/setkeh.html
index 0f92df3d93a0..5b65ea86c52c 100644
--- a/setkeh.html
+++ b/setkeh.html
@@ -36,87 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync setkeh
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync setkeh
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing setkeh
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced setkeh
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 setkeh
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing setkeh
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/setkeh&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced setkeh
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 setkeh
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/setkeh.txt b/setkeh.txt
index 9c2c38af1ad3..f6a3a5cb0e43 100644
--- a/setkeh.txt
+++ b/setkeh.txt
@@ -11,41 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:setkeh/Portage-Overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync setkeh
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing setkeh
-Cloning into '/var/lib/repo-mirror-ci/sync/setkeh'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced setkeh
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sevcsik.html b/sevcsik.html
index a4c1f8a5410d..84c1a34d9183 100644
--- a/sevcsik.html
+++ b/sevcsik.html
@@ -34,87 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sevcsik
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sevcsik
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sevcsik
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sevcsik
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sevcsik
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing sevcsik
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced sevcsik
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sevcsik
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sevcsik.txt b/sevcsik.txt
index 72a0e3696f3f..8a21c97f6757 100644
--- a/sevcsik.txt
+++ b/sevcsik.txt
@@ -10,41 +10,24 @@
{'type': 'git', 'uri': 'git://github.com/sevcsik/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:sevcsik/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sevcsik
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sevcsik
-Cloning into '/var/lib/repo-mirror-ci/sync/sevcsik'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sevcsik
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sft.html b/sft.html
index 0b84fbd1d1e4..f6a779c3e2f0 100644
--- a/sft.html
+++ b/sft.html
@@ -32,87 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync sft
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sft
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing sft
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced sft
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sft
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing sft
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced sft
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sft
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sft.txt b/sft.txt
index 02a043fd3b40..5768cf3dfaab 100644
--- a/sft.txt
+++ b/sft.txt
@@ -9,41 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/SFTtech/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sft
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sft
-Cloning into '/var/lib/repo-mirror-ci/sync/sft'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sft
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sgs.html b/sgs.html
index c96d579b2c3e..16034a628dcc 100644
--- a/sgs.html
+++ b/sgs.html
@@ -36,87 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sgs
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sgs
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sgs
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:poly-c repo at &#x27;/var/lib/repo-mirror-ci/sync/poly-c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sgs
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sgs
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing sgs
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sgs&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced sgs
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sgs
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sgs.txt b/sgs.txt
index bd19ab24d2cc..14c4d496850b 100644
--- a/sgs.txt
+++ b/sgs.txt
@@ -11,41 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:blackm0re/sgs-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sgs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:poly-c repo at '/var/lib/repo-mirror-ci/sync/poly-c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sgs
-Cloning into '/var/lib/repo-mirror-ci/sync/sgs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sgs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/shnurise.html b/shnurise.html
index 773f448bc0cc..8a010e329022 100644
--- a/shnurise.html
+++ b/shnurise.html
@@ -42,187 +42,143 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync shnurise
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync shnurise
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing shnurise
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:roslin repo at &#x27;/var/lib/repo-mirror-ci/sync/roslin&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:sarnex-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sarnex-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced shnurise
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 shnurise
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:setkeh repo at &#x27;/var/lib/repo-mirror-ci/sync/setkeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:sgs repo at &#x27;/var/lib/repo-mirror-ci/sync/sgs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing shnurise
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced shnurise
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 shnurise
-</pre></td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * dev-db/sharphsql-1.4-r20150714: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.1.3-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * dev-dotnet/antlr3-runtime-3.5.2_beta1_p2017080216-r3: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * dev-dotnet/aspnetwebstack-2014.10.27: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * dev-dotnet/autofac-configuration-3.5.2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * dev-dotnet/autofac-web-3.0.0.0-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * dev-dotnet/castle-core-1.2.0-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * dev-dotnet/castle-core-4.0.0_beta1-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * dev-dotnet/cecil-0.10_beta7_p2018031901-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * dev-dotnet/fluent-nhibernate-2.0.2-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * dev-dotnet/htmlparsersharp-1.0.0.0-r20150614: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * dev-dotnet/icsharpcode-nrefactory-5.5.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * dev-dotnet/irony-daxnet-1.0.0_p2017083101: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * dev-dotnet/microsoft-extensions-commandlineutils-2.3.4: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * dev-dotnet/nhibernate-4.1.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * dev-dotnet/nhibernate-core-3.3.4-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-dotnet/nhibernate-core-5.0.0-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-dotnet/nhibernate-iesi-collections-4.0.2-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-dotnet/nhibernate-linq-1.0.0.0_p2010050601-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-dotnet/npgsql-3.1.6-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * dev-dotnet/npgsql-4.0.4: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * dev-dotnet/pliant-0.4.2.1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * dev-dotnet/remotion-linq-2.1.2-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-dotnet/remotion-linq-eagerfetching-2.1.0-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre> * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-dotnet/roslyn-tools-0.0.0_p2019011903: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre> * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-dotnet/slntools-1.1.3_p201508170-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-gaclibs/Autopsy-Formats-PeCoff-1.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l89"><td><a href="#l89"><span>89</span></a></td><td><pre> * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * dev-gaclibs/github-api-0.0-r20150331: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-5, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l90"><td><a href="#l90"><span>90</span></a></td><td><pre> * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
+ <tr class="err" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> * dev-lang/mono-patched-6.12.0.102: failed sourcing ebuild: versionator: banned in EAPI=7; use ver_* instead, (versionator.eclass, line 37: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l91"><td><a href="#l91"><span>91</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI 0..6, (msbuild-framework.eclass, line 10: called die)
+ <tr class="err" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * dev-util/antlrcs-3.5.2_beta1_p2017080216-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI 0..6, (msbuild-framework.eclass, line 10: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l92"><td><a href="#l92"><span>92</span></a></td><td><pre> * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> * dev-util/asmspy-1.2.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l93"><td><a href="#l93"><span>93</span></a></td><td><pre> * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> * dev-util/gplex-dbremner-1.2.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l94"><td><a href="#l94"><span>94</span></a></td><td><pre> * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> * dev-util/gppg-dbremner-1.5.2_p2015112101-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l95"><td><a href="#l95"><span>95</span></a></td><td><pre> * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * dev-util/monodevelop-5.9.5.9: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l96"><td><a href="#l96"><span>96</span></a></td><td><pre> * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> * dev-util/monodevelop-5.10.0.609: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l97"><td><a href="#l97"><span>97</span></a></td><td><pre> * dev-util/monodevelop-5.10.3.51: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * dev-util/monodevelop-5.10.3.51: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l98"><td><a href="#l98"><span>98</span></a></td><td><pre> * dev-util/monodevelop-6.0.0.4761: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> * dev-util/monodevelop-6.0.0.4761: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l99"><td><a href="#l99"><span>99</span></a></td><td><pre> * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> * dev-util/monodevelop-6.1_p2016062206: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l100"><td><a href="#l100"><span>100</span></a></td><td><pre> * dev-util/monodevelop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * dev-util/monodevelop-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l101"><td><a href="#l101"><span>101</span></a></td><td><pre> * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre> * dev-util/naive-language-tools-1.13.11.16: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l102"><td><a href="#l102"><span>102</span></a></td><td><pre> * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * dev-util/nunit2-2.6.4_p2015011102-r2: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l103"><td><a href="#l103"><span>103</span></a></td><td><pre> * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre> * dev-util/repository-analyser-1.0.0.0: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l104"><td><a href="#l104"><span>104</span></a></td><td><pre> * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre> * dev-util/t4-1.3.1_p2018020903-r1: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l105"><td><a href="#l105"><span>105</span></a></td><td><pre> * media-gfx/pinta-1.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+ <tr class="err" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre> * media-gfx/pinta-1.6: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l106"><td><a href="#l106"><span>106</span></a></td><td><pre> * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
+ <tr class="err" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * www-apps/orchard-cms-1.7.3-r3: failed sourcing ebuild: this eclass doesn&#x27;t support EAPI-6, (dotnet.eclass, line 14: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l107"><td><a href="#l107"><span>107</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/shnurise.txt b/shnurise.txt
index feffe8158aab..481c2a6bc187 100644
--- a/shnurise.txt
+++ b/shnurise.txt
@@ -14,46 +14,24 @@
{'type': 'git',
'uri': 'git@github.com:ArsenShnurkov/shnurise.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync shnurise
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:roslin repo at '/var/lib/repo-mirror-ci/sync/roslin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sarnex-overlay repo at '/var/lib/repo-mirror-ci/sync/sarnex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:setkeh repo at '/var/lib/repo-mirror-ci/sync/setkeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sgs repo at '/var/lib/repo-mirror-ci/sync/sgs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing shnurise
-Cloning into '/var/lib/repo-mirror-ci/sync/shnurise'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced shnurise
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sihnon.html b/sihnon.html
index aebf00c1c717..f01164aecd58 100644
--- a/sihnon.html
+++ b/sihnon.html
@@ -36,95 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sihnon
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sihnon
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing sihnon
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced sihnon
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sihnon
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:setkeh repo at &#x27;/var/lib/repo-mirror-ci/sync/setkeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sgs repo at &#x27;/var/lib/repo-mirror-ci/sync/sgs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing sihnon
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced sihnon
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sihnon
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sihnon.txt b/sihnon.txt
index 6b24092ef717..3173f3b2eaa6 100644
--- a/sihnon.txt
+++ b/sihnon.txt
@@ -11,45 +11,24 @@
{'type': 'git',
'uri': 'git@github.com:optiz0r/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sihnon
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:setkeh repo at '/var/lib/repo-mirror-ci/sync/setkeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sgs repo at '/var/lib/repo-mirror-ci/sync/sgs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sihnon
-Cloning into '/var/lib/repo-mirror-ci/sync/sihnon'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sihnon
* Sync succeeded
$ git log --format=%ci -1
diff --git a/simonvanderveldt.html b/simonvanderveldt.html
index 06895cba7e10..9730fc10bd0f 100644
--- a/simonvanderveldt.html
+++ b/simonvanderveldt.html
@@ -42,93 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync simonvanderveldt
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync simonvanderveldt
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing simonvanderveldt
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced simonvanderveldt
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 simonvanderveldt
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:sihnon repo at &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing simonvanderveldt
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced simonvanderveldt
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 simonvanderveldt
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt
index 402467c4bb4f..d1d99d5a6160 100644
--- a/simonvanderveldt.txt
+++ b/simonvanderveldt.txt
@@ -14,44 +14,24 @@
{'type': 'git',
'uri': 'git@github.com:simonvanderveldt/simonvanderveldt-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync simonvanderveldt
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sihnon repo at '/var/lib/repo-mirror-ci/sync/sihnon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing simonvanderveldt
-Cloning into '/var/lib/repo-mirror-ci/sync/simonvanderveldt'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced simonvanderveldt
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sinustrom.html b/sinustrom.html
index a5621e38d26a..efa966688754 100644
--- a/sinustrom.html
+++ b/sinustrom.html
@@ -40,95 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sinustrom
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sinustrom
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sinustrom
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced sinustrom
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sinustrom
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:setkeh repo at &#x27;/var/lib/repo-mirror-ci/sync/setkeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:sgs repo at &#x27;/var/lib/repo-mirror-ci/sync/sgs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing sinustrom
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced sinustrom
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sinustrom
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sinustrom.txt b/sinustrom.txt
index 7a4053d7e143..222e6dc78a27 100644
--- a/sinustrom.txt
+++ b/sinustrom.txt
@@ -13,45 +13,24 @@
{'type': 'git',
'uri': 'git@github.com:zpuskas/sinustrom-gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sinustrom
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:setkeh repo at '/var/lib/repo-mirror-ci/sync/setkeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sgs repo at '/var/lib/repo-mirror-ci/sync/sgs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sinustrom
-Cloning into '/var/lib/repo-mirror-ci/sync/sinustrom'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sinustrom
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sk-overlay.html b/sk-overlay.html
index fcfc27c7a2ef..4b5cb4cab39b 100644
--- a/sk-overlay.html
+++ b/sk-overlay.html
@@ -38,95 +38,55 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync sk-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sk-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing sk-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sam_c repo at &#x27;/var/lib/repo-mirror-ci/sync/sam_c&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced sk-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sk-overlay
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sihnon repo at &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:sinustrom repo at &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing sk-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sk-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced sk-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sk-overlay
-</pre></td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * media-fonts/noto-20171025: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-fonts/noto-20171025: failed sourcing ebuild: EAPI 6 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/sk-overlay.txt b/sk-overlay.txt
index 4e62d4c995d2..959c778b345a 100644
--- a/sk-overlay.txt
+++ b/sk-overlay.txt
@@ -12,44 +12,24 @@
'uri': 'git://github.com/scriptkitties/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:scriptkitties/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sk-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sam_c repo at '/var/lib/repo-mirror-ci/sync/sam_c', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sihnon repo at '/var/lib/repo-mirror-ci/sync/sihnon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sinustrom repo at '/var/lib/repo-mirror-ci/sync/sinustrom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sk-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/sk-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sk-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/slonko.html b/slonko.html
index 605c9bc725ab..e85c97eee33c 100644
--- a/slonko.html
+++ b/slonko.html
@@ -30,91 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slonko
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync slonko
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing slonko
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced slonko
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slonko
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sinustrom repo at &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing slonko
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced slonko
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slonko
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/slonko.txt b/slonko.txt
index 67513c3b0ad6..f2a82ed04c1e 100644
--- a/slonko.txt
+++ b/slonko.txt
@@ -8,43 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync slonko
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sinustrom repo at '/var/lib/repo-mirror-ci/sync/sinustrom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing slonko
-Cloning into '/var/lib/repo-mirror-ci/sync/slonko'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced slonko
* Sync succeeded
$ git log --format=%ci -1
diff --git a/slyfox.html b/slyfox.html
index 124526298f17..233f8f607184 100644
--- a/slyfox.html
+++ b/slyfox.html
@@ -30,101 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync slyfox
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync slyfox
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing slyfox
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:fordfrog repo at &#x27;/var/lib/repo-mirror-ci/sync/fordfrog&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:qt repo at &#x27;/var/lib/repo-mirror-ci/sync/qt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ruby repo at &#x27;/var/lib/repo-mirror-ci/sync/ruby&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:salfter repo at &#x27;/var/lib/repo-mirror-ci/sync/salfter&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:scrill repo at &#x27;/var/lib/repo-mirror-ci/sync/scrill&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:setkeh repo at &#x27;/var/lib/repo-mirror-ci/sync/setkeh&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced slyfox
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sevcsik repo at &#x27;/var/lib/repo-mirror-ci/sync/sevcsik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sft repo at &#x27;/var/lib/repo-mirror-ci/sync/sft&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sgs repo at &#x27;/var/lib/repo-mirror-ci/sync/sgs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slyfox
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sihnon repo at &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:sinustrom repo at &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sk-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sk-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing slyfox
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced slyfox
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 slyfox
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/slyfox.txt b/slyfox.txt
index f867c6a55934..6446e3c53e70 100644
--- a/slyfox.txt
+++ b/slyfox.txt
@@ -8,48 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/trofi/slyfox-gentoo'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync slyfox
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ruby repo at '/var/lib/repo-mirror-ci/sync/ruby', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:salfter repo at '/var/lib/repo-mirror-ci/sync/salfter', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:scrill repo at '/var/lib/repo-mirror-ci/sync/scrill', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:setkeh repo at '/var/lib/repo-mirror-ci/sync/setkeh', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sevcsik repo at '/var/lib/repo-mirror-ci/sync/sevcsik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sft repo at '/var/lib/repo-mirror-ci/sync/sft', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sgs repo at '/var/lib/repo-mirror-ci/sync/sgs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sihnon repo at '/var/lib/repo-mirror-ci/sync/sihnon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sinustrom repo at '/var/lib/repo-mirror-ci/sync/sinustrom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sk-overlay repo at '/var/lib/repo-mirror-ci/sync/sk-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing slyfox
-Cloning into '/var/lib/repo-mirror-ci/sync/slyfox'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced slyfox
* Sync succeeded
$ git log --format=%ci -1
diff --git a/smaeul.html b/smaeul.html
index beaef06f19ae..e386531d0768 100644
--- a/smaeul.html
+++ b/smaeul.html
@@ -38,87 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync smaeul
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync smaeul
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing smaeul
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sihnon repo at &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sinustrom repo at &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sk-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sk-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced smaeul
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 smaeul
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing smaeul
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced smaeul
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 smaeul
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/smaeul.txt b/smaeul.txt
index 0bf868a9d4b6..d41a3c58df8a 100644
--- a/smaeul.txt
+++ b/smaeul.txt
@@ -12,41 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/smaeul/portage-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync smaeul
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sihnon repo at '/var/lib/repo-mirror-ci/sync/sihnon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sinustrom repo at '/var/lib/repo-mirror-ci/sync/sinustrom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sk-overlay repo at '/var/lib/repo-mirror-ci/sync/sk-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing smaeul
-Cloning into '/var/lib/repo-mirror-ci/sync/smaeul'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced smaeul
* Sync succeeded
$ git log --format=%ci -1
diff --git a/snapd.html b/snapd.html
index 6c371f787101..5a16da9f16b9 100644
--- a/snapd.html
+++ b/snapd.html
@@ -30,89 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync snapd
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync snapd
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing snapd
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sihnon repo at &#x27;/var/lib/repo-mirror-ci/sync/sihnon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sinustrom repo at &#x27;/var/lib/repo-mirror-ci/sync/sinustrom&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sk-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sk-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced snapd
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 snapd
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing snapd
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced snapd
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 snapd
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/snapd.txt b/snapd.txt
index 679e96aea7ce..8273315cd793 100644
--- a/snapd.txt
+++ b/snapd.txt
@@ -8,42 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/zigford/snapd.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync snapd
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sihnon repo at '/var/lib/repo-mirror-ci/sync/sihnon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sinustrom repo at '/var/lib/repo-mirror-ci/sync/sinustrom', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sk-overlay repo at '/var/lib/repo-mirror-ci/sync/sk-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing snapd
-Cloning into '/var/lib/repo-mirror-ci/sync/snapd'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced snapd
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sogo-connector.html b/sogo-connector.html
index 61f710c8c57f..fef63c65d444 100644
--- a/sogo-connector.html
+++ b/sogo-connector.html
@@ -40,89 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sogo-connector
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sogo-connector
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sogo-connector
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:shnurise repo at &#x27;/var/lib/repo-mirror-ci/sync/shnurise&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sk-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/sk-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced sogo-connector
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sogo-connector
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing sogo-connector
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced sogo-connector
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sogo-connector
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sogo-connector.txt b/sogo-connector.txt
index 4b297994bf7a..e324e9fed805 100644
--- a/sogo-connector.txt
+++ b/sogo-connector.txt
@@ -13,42 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sogo-connector
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:shnurise repo at '/var/lib/repo-mirror-ci/sync/shnurise', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sk-overlay repo at '/var/lib/repo-mirror-ci/sync/sk-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sogo-connector
-Cloning into '/var/lib/repo-mirror-ci/sync/sogo-connector'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sogo-connector
* Sync succeeded
$ git log --format=%ci -1
diff --git a/soltys.html b/soltys.html
index 61b96d85fbd7..da2122aa4971 100644
--- a/soltys.html
+++ b/soltys.html
@@ -38,87 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync soltys
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync soltys
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing soltys
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced soltys
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 soltys
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing soltys
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced soltys
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 soltys
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/soltys.txt b/soltys.txt
index 499a6c6bb087..49889a9a2f00 100644
--- a/soltys.txt
+++ b/soltys.txt
@@ -12,41 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/soltysek/soltys-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync soltys
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing soltys
-Cloning into '/var/lib/repo-mirror-ci/sync/soltys'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced soltys
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sorinp.html b/sorinp.html
index 4fbbd4226237..19b43c3c5996 100644
--- a/sorinp.html
+++ b/sorinp.html
@@ -34,89 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sorinp
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sorinp
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sorinp
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sorinp
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sorinp
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing sorinp
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced sorinp
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sorinp
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sorinp.txt b/sorinp.txt
index 0778e66d40ac..53081bd5e731 100644
--- a/sorinp.txt
+++ b/sorinp.txt
@@ -10,42 +10,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/psihozefir/sorinp-gentoo-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sorinp
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sorinp
-Cloning into '/var/lib/repo-mirror-ci/sync/sorinp'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sorinp
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sorrow.html b/sorrow.html
index a96c3e04a98e..e289f8d599e4 100644
--- a/sorrow.html
+++ b/sorrow.html
@@ -34,87 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync sorrow
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync sorrow
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing sorrow
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced sorrow
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sorrow
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing sorrow
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced sorrow
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sorrow
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sorrow.txt b/sorrow.txt
index a8f6a7134cd7..69be7994f0f2 100644
--- a/sorrow.txt
+++ b/sorrow.txt
@@ -10,41 +10,24 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sorrow
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sorrow
-Cloning into '/var/lib/repo-mirror-ci/sync/sorrow'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sorrow
* Sync succeeded
$ git log --format=%ci -1
diff --git a/spikyatlinux.html b/spikyatlinux.html
index 793756bd8502..d332f98bcca8 100644
--- a/spikyatlinux.html
+++ b/spikyatlinux.html
@@ -32,87 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync spikyatlinux
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync spikyatlinux
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing spikyatlinux
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced spikyatlinux
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 spikyatlinux
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing spikyatlinux
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced spikyatlinux
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 spikyatlinux
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/spikyatlinux.txt b/spikyatlinux.txt
index f0e42a434681..82b24b2f3f7d 100644
--- a/spikyatlinux.txt
+++ b/spikyatlinux.txt
@@ -9,41 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/spikyatlinux/ebuilds_for_gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync spikyatlinux
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing spikyatlinux
-Cloning into '/var/lib/repo-mirror-ci/sync/spikyatlinux'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced spikyatlinux
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sping.html b/sping.html
index 654a8d62bbed..9c4549bfa9ef 100644
--- a/sping.html
+++ b/sping.html
@@ -42,87 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sping
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync sping
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing sping
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced sping
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sping
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing sping
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced sping
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sping
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sping.txt b/sping.txt
index 75389ab687ba..72bb8f31886c 100644
--- a/sping.txt
+++ b/sping.txt
@@ -14,41 +14,24 @@
{'type': 'git',
'uri': 'git@github.com:hartwork/gentoo-overlay-sping.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync sping
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sping
-Cloning into '/var/lib/repo-mirror-ci/sync/sping'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sping
* Sync succeeded
$ git log --format=%ci -1
diff --git a/squeezebox.html b/squeezebox.html
index bf05fb78ca20..c599d53347f8 100644
--- a/squeezebox.html
+++ b/squeezebox.html
@@ -42,89 +42,53 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync squeezebox
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync squeezebox
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing squeezebox
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced squeezebox
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 squeezebox
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing squeezebox
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced squeezebox
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 squeezebox
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/squeezebox.txt b/squeezebox.txt
index 4393880950c2..53f77510ef1c 100644
--- a/squeezebox.txt
+++ b/squeezebox.txt
@@ -14,42 +14,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/squeezebox.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync squeezebox
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing squeezebox
-Cloning into '/var/lib/repo-mirror-ci/sync/squeezebox'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced squeezebox
* Sync succeeded
$ git log --format=%ci -1
diff --git a/src_prepare-overlay.html b/src_prepare-overlay.html
index 3b7f27fee9b4..c3e9a6642c18 100644
--- a/src_prepare-overlay.html
+++ b/src_prepare-overlay.html
@@ -32,91 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync src_prepare-overlay
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync src_prepare-overlay
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing src_prepare-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced src_prepare-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 src_prepare-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing src_prepare-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced src_prepare-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 src_prepare-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt
index 03c4eec8a9ef..375573474d2c 100644
--- a/src_prepare-overlay.txt
+++ b/src_prepare-overlay.txt
@@ -9,43 +9,24 @@
{'type': 'git',
'uri': 'git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync src_prepare-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing src_prepare-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/src_prepare-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced src_prepare-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ssnb.html b/ssnb.html
index 1df01159f45f..b397be37b6e0 100644
--- a/ssnb.html
+++ b/ssnb.html
@@ -38,91 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ssnb
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ssnb
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing ssnb
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ssnb
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ssnb
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing ssnb
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced ssnb
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ssnb
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ssnb.txt b/ssnb.txt
index d090b10eaec4..4fd1a46ae5ab 100644
--- a/ssnb.txt
+++ b/ssnb.txt
@@ -12,43 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/ssnb.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync ssnb
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ssnb
-Cloning into '/var/lib/repo-mirror-ci/sync/ssnb'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ssnb
* Sync succeeded
$ git log --format=%ci -1
diff --git a/sspreitz.html b/sspreitz.html
index 8465293fba6f..a318cdea7c52 100644
--- a/sspreitz.html
+++ b/sspreitz.html
@@ -40,91 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync sspreitz
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync sspreitz
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing sspreitz
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slyfox repo at &#x27;/var/lib/repo-mirror-ci/sync/slyfox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced sspreitz
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sspreitz
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing sspreitz
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced sspreitz
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sspreitz
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/sspreitz.txt b/sspreitz.txt
index 3a96033d0e35..a8419a79339c 100644
--- a/sspreitz.txt
+++ b/sspreitz.txt
@@ -13,43 +13,24 @@
{'type': 'git',
'uri': 'git@github.com:sspreitzer/gentoo-repo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync sspreitz
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slyfox repo at '/var/lib/repo-mirror-ci/sync/slyfox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing sspreitz
-Cloning into '/var/lib/repo-mirror-ci/sync/sspreitz'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced sspreitz
* Sync succeeded
$ git log --format=%ci -1
diff --git a/steam-overlay.html b/steam-overlay.html
index 514758e9ee41..70c44c5300b8 100644
--- a/steam-overlay.html
+++ b/steam-overlay.html
@@ -36,91 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync steam-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync steam-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing steam-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced steam-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 steam-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing steam-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced steam-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 steam-overlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/steam-overlay.txt b/steam-overlay.txt
index b2a807c00a61..a2a93e25ec2c 100644
--- a/steam-overlay.txt
+++ b/steam-overlay.txt
@@ -11,43 +11,24 @@
{'type': 'git', 'uri': 'git://github.com/anyc/steam-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:anyc/steam-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync steam-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing steam-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/steam-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced steam-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/stefantalpalaru.html b/stefantalpalaru.html
index 472d667e4f11..1ec5d38bba39 100644
--- a/stefantalpalaru.html
+++ b/stefantalpalaru.html
@@ -42,93 +42,55 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync stefantalpalaru
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync stefantalpalaru
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>*** syncing stefantalpalaru
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** synced stefantalpalaru
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stefantalpalaru
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing stefantalpalaru
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced stefantalpalaru
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stefantalpalaru
-</pre></td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * media-tv/dvb-firmware-20170329-r1: failed sourcing ebuild: inherit: missing eclass argument
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * media-tv/dvb-firmware-20170329-r1: failed sourcing ebuild: inherit: missing eclass argument
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/stefantalpalaru.txt b/stefantalpalaru.txt
index 91958678a3a8..636ab80b4fce 100644
--- a/stefantalpalaru.txt
+++ b/stefantalpalaru.txt
@@ -14,43 +14,24 @@
{'type': 'git',
'uri': 'git@github.com:stefantalpalaru/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync stefantalpalaru
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing stefantalpalaru
-Cloning into '/var/lib/repo-mirror-ci/sync/stefantalpalaru'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced stefantalpalaru
* Sync succeeded
$ git log --format=%ci -1
diff --git a/stha09.html b/stha09.html
index c691432cc129..e2a13de3c94f 100644
--- a/stha09.html
+++ b/stha09.html
@@ -34,91 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync stha09
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync stha09
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing stha09
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced stha09
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stha09
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing stha09
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced stha09
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stha09
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/stha09.txt b/stha09.txt
index 4c15e0191ea7..670b790af4c7 100644
--- a/stha09.txt
+++ b/stha09.txt
@@ -10,43 +10,24 @@
{'type': 'git', 'uri': 'git://github.com:stha09/gpo-stha09.git'},
{'type': 'git', 'uri': 'git@github.com:stha09/gpo-stha09.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync stha09
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing stha09
-Cloning into '/var/lib/repo-mirror-ci/sync/stha09'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced stha09
* Sync succeeded
$ git log --format=%ci -1
diff --git a/stowe-verlay.html b/stowe-verlay.html
index 4c94811d4ab5..9871b0b0c769 100644
--- a/stowe-verlay.html
+++ b/stowe-verlay.html
@@ -38,101 +38,65 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync stowe-verlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync stowe-verlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing stowe-verlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced stowe-verlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stowe-verlay
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing stowe-verlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced stowe-verlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stowe-verlay
-</pre></td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * net-analyzer/nagios-check_unifi-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * net-analyzer/nagios-check_unifi-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * net-fs/samba-4.8.6-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * net-fs/samba-4.8.6-r3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * net-fs/winexe-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * net-fs/winexe-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * net-fs/winexe-1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * net-fs/winexe-1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * net-fs/winexe-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * net-fs/winexe-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * net-fs/winexe-4.8.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * net-fs/winexe-4.8.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/stowe-verlay.txt b/stowe-verlay.txt
index e0652d3658ee..13d6943280e0 100644
--- a/stowe-verlay.txt
+++ b/stowe-verlay.txt
@@ -12,42 +12,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/mwstowe/stowe-verlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync stowe-verlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing stowe-verlay
-Cloning into '/var/lib/repo-mirror-ci/sync/stowe-verlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced stowe-verlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/strohel.html b/strohel.html
index 520a165eb326..ccbaeefd0083 100644
--- a/strohel.html
+++ b/strohel.html
@@ -40,91 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync strohel
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync strohel
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing strohel
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sage-on-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/sage-on-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sattvik repo at &#x27;/var/lib/repo-mirror-ci/sync/sattvik&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:seden repo at &#x27;/var/lib/repo-mirror-ci/sync/seden&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:simonvanderveldt repo at &#x27;/var/lib/repo-mirror-ci/sync/simonvanderveldt&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:smaeul repo at &#x27;/var/lib/repo-mirror-ci/sync/smaeul&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:snapd repo at &#x27;/var/lib/repo-mirror-ci/sync/snapd&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced strohel
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:perl-experimental repo at &#x27;/var/lib/repo-mirror-ci/sync/perl-experimental&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 strohel
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sorinp repo at &#x27;/var/lib/repo-mirror-ci/sync/sorinp&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing strohel
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced strohel
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 strohel
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/strohel.txt b/strohel.txt
index 20d7c22ade41..1a3b69b38648 100644
--- a/strohel.txt
+++ b/strohel.txt
@@ -13,43 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:strohel/strohel-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync strohel
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sage-on-gentoo repo at '/var/lib/repo-mirror-ci/sync/sage-on-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:simonvanderveldt repo at '/var/lib/repo-mirror-ci/sync/simonvanderveldt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:smaeul repo at '/var/lib/repo-mirror-ci/sync/smaeul', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:snapd repo at '/var/lib/repo-mirror-ci/sync/snapd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:perl-experimental repo at '/var/lib/repo-mirror-ci/sync/perl-experimental', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorinp repo at '/var/lib/repo-mirror-ci/sync/sorinp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing strohel
-Cloning into '/var/lib/repo-mirror-ci/sync/strohel'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced strohel
* Sync succeeded
$ git log --format=%ci -1
diff --git a/stuff.html b/stuff.html
index f355a297fd7d..dbb1c36e68fc 100644
--- a/stuff.html
+++ b/stuff.html
@@ -26,113 +26,53 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync stuff
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync stuff
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing stuff
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced stuff
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stuff
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing stuff
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced stuff
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stuff
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/stuff.txt b/stuff.txt
index 1adedb07faf4..ba5e4c70c69a 100644
--- a/stuff.txt
+++ b/stuff.txt
@@ -6,54 +6,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/istitov/stuff.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync stuff
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing stuff
-Cloning into '/var/lib/repo-mirror-ci/sync/stuff'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced stuff
* Sync succeeded
$ git log --format=%ci -1
diff --git a/summary.json b/summary.json
index b6ac6757d149..a5e543f20287 100644
--- a/summary.json
+++ b/summary.json
@@ -1 +1 @@
-{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 79}, "2xsaiko": {"quality": "experimental", "status": "unofficial", "name": "2xsaiko", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://git.sr.ht/~dblsaiko/ebuilds", "owner": [{"type": "person", "email": "gentoo@dblsaiko.net", "name": "2xsaiko"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~dblsaiko/ebuilds"}, {"type": "git", "uri": "git@git.sr.ht:~dblsaiko/ebuilds"}], "feed": ["https://git.sr.ht/~dblsaiko/ebuilds/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:50:06 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 243}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:19:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 458}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 17:45:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-05 17:32:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-28 21:11:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 00:16:11 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-17 16:30:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-18 21:05:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 18:53:13 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-21 09:08:43 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2741}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-31 14:10:23 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 17:43:33 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 09:39:51 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 110}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 21017}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 10:42:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-21 16:01:39 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-10 03:08:50 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-10 16:28:13 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-14 22:02:51 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 23:02:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-07 14:18:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-01-21 15:49:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-05-22 00:05:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "alxu": {"quality": "experimental", "status": "unofficial", "name": "alxu", "description": {"en": "Alex Xu (Hello71) personal overlay"}, "homepage": "https://cgit.alxu.ca/gentoo-overlay.git/", "owner": [{"type": "person", "email": "alex_y_xu@yahoo.ca", "name": "Alex Xu (Hello71)"}], "source": [{"type": "git", "uri": "https://git.alxu.ca/gentoo-overlay.git"}], "feed": ["https://cgit.alxu.ca/gentoo-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 18:51:36 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 10:40:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-15 16:34:50 -0600\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "anard": {"quality": "experimental", "status": "unofficial", "name": "anard", "description": {"en": "Anard's personnal repository, with some new ebuilds"}, "homepage": "https://github.com/Anard/anard-overlay", "owner": [{"type": "person", "email": "anard@free.fr", "name": "Anard"}], "source": [{"type": "git", "uri": "https://github.com/Anard/anard-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Anard/anard-overlay.git"}], "feed": ["https://github.com/Anard/anard-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-08 14:02:45 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-23 08:35:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:08:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-28 20:54:26 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-22 09:36:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 00:55:19 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2118}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:25:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 78}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 23:33:21 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-02 08:59:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n ", "fr": "\n Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 15:47:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 21:21:39 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 13:34:07 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-02 21:35:41 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:22:29 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-28 16:44:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 19:57:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 00:05:00 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2017-09-09 16:34:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-30 13:09:33 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 16:51:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 463}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 13:29:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 05:11:06 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 376}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 21:05:25 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-03 21:04:52 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 570}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 16:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:40:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 12:45:10 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 240}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-11 12:32:26 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 19:38:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "certbot-dns-plugins": {"quality": "experimental", "status": "unofficial", "name": "certbot-dns-plugins", "description": {"en": "Overlay for the DNS plugins of the ACME client certbot"}, "homepage": "https://github.com/osirisinferi/certbot-dns-plugins-overlay", "owner": [{"type": "person", "email": "gentoo@flut.demon.nl", "name": "Osiris Inferi"}], "source": [{"type": "git", "uri": "https://github.com/osirisinferi/certbot-dns-plugins-overlay.git"}, {"type": "git", "uri": "git@github.com:osirisinferi/certbot-dns-plugins-overlay.git"}], "feed": ["https://github.com/osirisinferi/certbot-dns-plugins-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 21:10:02 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 02:19:23 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 116}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "source": [{"type": "git", "uri": "https://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TheChymera/overlay.git"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:11:32 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"], "x-ebuild-count": 35}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "cosmicmod": {"quality": "experimental", "status": "unofficial", "name": "cosmicmod", "description": {"en": "CosmicMod Gentoo Overlay"}, "homepage": "https://github.com/cosmicoz/gentoo-overlay", "owner": [{"type": "person", "email": "oz@cosmicmod.net", "name": "Oz"}], "source": [{"type": "git", "uri": "https://github.com/cosmicoz/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-21 17:06:37 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 10:12:09 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "dargor": {"quality": "experimental", "status": "unofficial", "name": "dargor", "description": {"en": "Personal overlay for packages I care of"}, "homepage": "https://github.com/dargor/dargor_gentoo_overlay", "owner": [{"type": "person", "email": "linder.gabriel@gmail.com", "name": "Gabriel Linder"}], "source": [{"type": "git", "uri": "https://github.com/dargor/dargor_gentoo_overlay.git"}, {"type": "git", "uri": "git@github.com:dargor/dargor_gentoo_overlay.git"}], "feed": ["https://github.com/dargor/dargor_gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 10:14:08 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:45:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 12:03:43 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 00:02:11 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 16:20:01 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 73}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "dequbed": {"quality": "experimental", "status": "unofficial", "name": "dequbed", "description": {"en": "Personal overlay containing mostly small utilities and less stable package versions"}, "homepage": "https://github.com/dequbed/overlay.git", "owner": [{"type": "person", "email": "me@dequbed.space"}], "source": [{"type": "git", "uri": "https://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git@github.com:dequbed/overlay.git"}], "feed": ["https://github.com/dequbed/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 20:23:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 23:14:32 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 252}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:01:25 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-11-01 16:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 09:08:24 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:21:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 18:17:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "dm9pZCAq": {"quality": "experimental", "status": "unofficial", "name": "dm9pZCAq", "description": {"en": "personal overlay with different packages, mainly with packages with KISS mindset"}, "homepage": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay", "owner": [{"type": "person", "email": "v@0x0c.xyz", "name": "dm9pZCAq"}], "source": [{"type": "git", "uri": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:19:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 12:30:43 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:49:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 168}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@pm.me", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 10:31:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 00:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 08:17:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 19:16:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "electron": {"quality": "experimental", "status": "unofficial", "name": "electron", "description": {"en": "Electron Overlay"}, "homepage": "https://github.com/elprans/electron-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/electron-overlay.git"}], "feed": ["https://github.com/elprans/electron-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 14:02:03 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-28 21:04:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-18 00:43:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n experimental or work-in-progress. Don't rely on them, but don't\n hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-22 10:07:44 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:34:34 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 13:12:56 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "escpr2": {"quality": "experimental", "status": "unofficial", "name": "escpr2", "description": {"en": "EPSON ESCPR2 inkjet printer repository"}, "homepage": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2", "owner": [{"type": "person", "email": "andreas.thalhammer@linux.com", "name": "Andreas Thalhammer"}], "source": [{"type": "git", "uri": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git"}], "feed": ["https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:38:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-07 16:42:19 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "https://gitlab.com/extsidvind/ext-devlibs", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "git", "uri": "https://gitlab.com/extsidvind/ext-devlibs.git"}, {"type": "git", "uri": "git@gitlab.com:extsidvind/ext-devlibs.git"}], "feed": ["https://gitlab.com/extsidvind/ext-devlibs/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 00:06:10 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 21:32:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 19:03:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 123}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 21:19:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-11-21 13:15:46.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 14:35:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 10:13:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 19:52:53 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:41:02 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-26 18:36:07 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 101}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 05:58:14 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:38:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 09:45:31 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 16:19:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 23:07:14 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-01 08:18:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-31 08:32:58 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 16:53:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n Gamers overlay for all various games. Not related with games team.\n "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:32:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 103}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:54:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.org/gentoo-portage"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/repo/gentoo.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/gentoo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/gentoo.git"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-31 13:54:02 +0200\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 29149}, "gentoo-bootstrap": {"quality": "experimental", "status": "unofficial", "name": "gentoo-bootstrap", "description": {"en": "Overlay providing packages to bootstrap OpenJDK and Rust"}, "homepage": "https://gitlab.com/stikonas/gentoo-bootstrap", "owner": [{"type": "person", "email": "andrius@stikonas.eu", "name": "Andrius \u0160tikonas"}], "source": [{"type": "git", "uri": "https://gitlab.com/stikonas/gentoo-bootstrap.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git"}], "x-state": "GOOD", "x-timestamp": "2020-11-13 21:17:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-07 22:21:22 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 173}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:34:37 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 234}, "gentoobr": {"quality": "experimental", "status": "unofficial", "name": "gentoobr", "description": {"en": "Overlay containing experimental packages developed\n by the brazilian community, with focus on providing programs useful to\n portuguese speaking users and introducing new people to contribute.", "pt": "Overlay contendo pacotes experimentais desenvolvidos\n pela comunidade brasileira, com foco em oferecer programas \u00fateis \u00e0 falantes\n da l\u00edngua portuguesa e em introduzir novas pessoas a contribuir."}, "homepage": "https://github.com/gentoobr/overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Henrique Neumann"}], "source": [{"type": "git", "uri": "https://github.com/gentoobr/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoobr/overlay.git"}], "feed": ["https://github.com/gentoobr/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 04:13:19 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n test ebuilds). Highly experimental. It is meant as a playground for me,\n but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:52:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-06 15:11:38 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "prote@fmi.uni-stuttgart.de", "name": "Horst Prote"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-18 16:32:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-22 19:46:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-23 21:50:20 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 110}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-04 10:43:15 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 191}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-15 20:24:11 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-01-14 17:11:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-27 21:38:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 241}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goduck777": {"quality": "experimental", "status": "unofficial", "name": "goduck777", "description": {"en": "Personal overlay containing some not-so-popular apps"}, "homepage": "https://github.com/goduck777/gentoo-overlay", "owner": [{"type": "person", "email": "goduck777@gmail.com", "name": "Chang Liu"}], "source": [{"type": "git", "uri": "https://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:goduck777/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:07:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-16 19:37:55 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-29 07:47:26 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 422}, "griffon_overlay": {"quality": "experimental", "status": "unofficial", "name": "griffon_overlay", "description": {"en": "Personal overlay of GriffOn Yi"}, "homepage": "https://github.com/windfail/griffon_overlay", "owner": [{"type": "person", "email": "yily_101@163.com", "name": "GriffOn Yi"}], "source": [{"type": "git", "uri": "https://github.com/windfail/griffon_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/windfail/griffon_overlay.git"}], "feed": ["https://github.com/windfail/griffon_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:29:59 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/guru.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/guru.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-30 21:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 956}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:31:40 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 18:47:46 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 23:34:13 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 18:25:19 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2483}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 18:40:23 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 13:33:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-24 16:45:02 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-28 17:09:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 17:37:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:21:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "hotstoast": {"quality": "experimental", "status": "unofficial", "name": "hotstoast", "description": {"en": "Tom Hotston's personal overlay"}, "homepage": "https://github.com/TomHotston/hotstoast-overlay", "owner": [{"type": "person", "email": "hotston.tom@gmail.com", "name": "Tom Hotston"}], "source": [{"type": "git", "uri": "https://github.com/TomHotston/hotstoast-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TomHotston/hotstoast-overlay.git"}], "feed": ["https://github.com/TomHotston/hotstoast-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 03:29:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 10:31:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 104}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 06:34:02 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-25 09:15:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-25 11:41:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 131}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 13:22:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 14:15:50 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 933}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-22 09:20:47 -0100\n", "x-openpgp-signed": "Y", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 16:01:53 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 521}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 13:11:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 12:41:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 342}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:22:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 22:18:07 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 551}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 01:48:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 18:26:47 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 98}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-01 00:06:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 04:12:04 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "kripton-overlay": {"quality": "experimental", "status": "unofficial", "name": "kripton-overlay", "description": {"en": "Gentoo portage overlay with packages needed or developed by kripton"}, "homepage": "https://github.com/kripton/kripton-overlay", "owner": [{"type": "person", "email": "kripton@kripserver.net", "name": "Jannis Achstetter"}], "source": [{"type": "git", "uri": "https://github.com/kripton/kripton-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/kripton/kripton-overlay.git"}], "feed": ["https://github.com/kripton/kripton-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 21:22:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "kske": {"quality": "experimental", "status": "unofficial", "name": "kske", "description": {"en": "Kai S. K. Engelbart's personal overlay"}, "homepage": "https://git.kske.dev/kske/gentoo-overlay", "owner": [{"type": "person", "email": "kai@kske.dev", "name": "Kai S. K. Engelbart"}], "source": [{"type": "git", "uri": "https://git.kske.dev/kske/gentoo-overlay.git"}, {"type": "git", "uri": "ssh://git@git.kske.dev:420/kske/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-25 09:56:54 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-28 10:51:37 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 213}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 10:01:13 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:07:20 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-22 17:16:47 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "liftm": {"quality": "experimental", "status": "unofficial", "name": "liftm", "description": {"en": "Personal Overlay"}, "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/liftm-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/liftm-overlay.git"}], "feed": ["https://github.com/jcaesar/liftm-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 18:38:40 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 16:03:55 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 21:41:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 198}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n Support and feedback in `#gentoo-lisp' and via\n `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-21 13:59:34 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 381}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 11:47:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 230}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2021-03-21 16:50:02 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 13}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 23:01:46 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 179}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-20 18:42:18 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:17:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-15 18:52:27 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 13:36:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 34}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:07:37 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 443}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-30 12:45:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 09:00:44 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n for packages in the Gentoo tree, latest version ebuilds and newpackages\n not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-01 23:22:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-12-26 18:30:33 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-19 22:24:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-14 17:48:50 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:41:13 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 132}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"], "x-ebuild-count": 1}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n (lack of maintainer or too experimental) and live ebuilds\n or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-21 09:16:07 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 158}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 23:30:16 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 550}, "myrvolay": {"quality": "experimental", "status": "unofficial", "name": "myrvolay", "description": {"en": "myrvogna's personal Gentoo overlay"}, "homepage": "https://github.com/myrvogna/myrvolay", "owner": [{"type": "person", "email": "octiabrina@myrvogna.net", "name": "Octiabrina Terrien-Puig"}], "source": [{"type": "git", "uri": "https://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git@github.com:myrvogna/myrvolay.git"}], "feed": ["https://github.com/myrvogna/myrvolay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-18 14:49:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-12 01:11:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "natinst": {"quality": "experimental", "status": "unofficial", "name": "natinst", "description": {"en": "VISA and National Instruments drivers"}, "homepage": "https://github.com/AndrewAmmerlaan/natinst", "owner": [{"type": "person", "email": "andrewammerlaan@riseup.net", "name": "Andrew Ammerlaan"}], "source": [{"type": "git", "uri": "https://github.com/AndrewAmmerlaan/natinst.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AndrewAmmerlaan/natinst.git"}], "feed": ["https://github.com/AndrewAmmerlaan/natinst/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-18 19:41:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1644}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 16:10:15 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 23:01:18 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1010}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-25 19:06:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "nitratesky": {"quality": "experimental", "status": "unofficial", "name": "nitratesky", "description": {"en": "Personal overlay of Vladimir Timofeenko"}, "homepage": "https://github.com/VTimofeenko/nitratesky", "owner": [{"type": "person", "email": "overlay.maintain@vtimofeenko.com", "name": "Vladimir Timofeenko"}], "source": [{"type": "git", "uri": "https://github.com/VTimofeenko/nitratesky.git"}, {"type": "git", "uri": "git+ssh://git@github.com/VTimofeenko/nitratesky.git"}], "feed": ["https://github.com/VTimofeenko/nitratesky/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 10:25:43 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "nest"], "x-ebuild-count": 48}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 09:14:39 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-21 15:12:55 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "nymphos": {"quality": "experimental", "status": "unofficial", "name": "nymphos", "description": {"en": "Overlay for ebuilds used in NymphOS"}, "homepage": "https://git.nymphos.ga/", "owner": [{"type": "person", "email": "neeshy@tfwno.gf"}], "source": [{"type": "git", "uri": "https://git.nymphos.ga/anon/nymphos"}], "feed": ["https://git.nymphos.ga/nymphos/atom"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 03:32:31 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 17:02:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 18:24:32 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 11:22:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "overseerr-overlay": {"quality": "experimental", "status": "unofficial", "name": "overseerr-overlay", "description": {"en": "third party overlay to install overseerr"}, "homepage": "https://github.com/chriscpritchard/overseerr-overlay", "owner": [{"type": "person", "email": "chris@christopherpritchard.co.uk", "name": "Chris Pritchard"}], "source": [{"type": "git", "uri": "https://github.com/chriscpritchard/overseerr-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git"}], "feed": ["https://github.com/chriscpritchard/overseerr-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 15:47:25 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:17:25 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 16:53:39 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 21:24:57 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 1310}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-21 16:21:04 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 12:08:27 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 16:27:28 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 475}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 10:25:57 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "phoenix591": {"quality": "experimental", "status": "unofficial", "name": "phoenix591", "description": {"en": "My personal overlay with a few random packages"}, "homepage": "https://github.com/Phoenix591/gentoo-overlay", "owner": [{"type": "person", "email": "kcelbert@gmail.com", "name": "Kyle Elbert"}], "source": [{"type": "git", "uri": "https://github.com/Phoenix591/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Phoenix591/gentoo-overlay.git"}], "feed": ["https://github.com/Phoenix591/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 06:54:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 14:09:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-22 22:39:15 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 12:26:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 15:50:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:29:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 00:08:43 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 09:28:36 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 20:05:02.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 296}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 01:50:21 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 09:51:09 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 01:00:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 08:45:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-29 12:56:32 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 11:14:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 18:07:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 564}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 14:08:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-27 11:51:19 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-19 15:35:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-19 03:04:49 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-24 08:56:38 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 51}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 13:01:30 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-04 12:01:09 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://gitlab.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git"}], "feed": ["https://gitlab.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 18:32:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 18:08:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 21:06:51 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 14:18:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 102}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 10:05:17 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 22:21:58 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "robertgzr": {"quality": "experimental", "status": "unofficial", "name": "robertgzr", "description": {"en": "robertgzr's personal overlay."}, "homepage": "https://git.sr.ht/~robertgzr/portage", "owner": [{"type": "person", "email": "robert@gnzler.io", "name": "Robert G\u00fcnzler"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~robertgzr/portage"}, {"type": "git", "uri": "ssh://git@git.sr.ht:~robertgzr/portage"}], "feed": ["https://git.sr.ht/~robertgzr/portage/log/rss.xml"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-12 12:51:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-05 09:20:02 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "ryans": {"quality": "experimental", "status": "unofficial", "name": "ryans", "description": {"en": "Personal ebuild repository."}, "homepage": "https://github.com/bekcpear/ryans-repos", "owner": [{"type": "person", "email": "i@bitbili.net", "name": "Ryan Qian"}], "source": [{"type": "git", "uri": "https://github.com/bekcpear/ryans-repos.git"}, {"type": "git", "uri": "git@github.com:bekcpear/ryans-repos.git"}], "feed": ["https://github.com/bekcpear/ryans-repos/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 15:33:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n Gentoo (or just being useful for Gentoo users as well):\n hot fixes, ebuild updates, etc.\n For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-19 23:00:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n split packages, etc.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 23:19:56 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 513}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-25 14:01:09 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 265}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:44:46 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 15:32:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-04 18:47:35 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n outside of the main portage tree on experimental ebuilds. Our aim is to\n increase the rate of development of scientific packages for Gentoo, but\n ebuilds in this repository are by their very nature more experimental. If\n you wish to use them you should be willing to help test and report\n bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 13:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 723}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-25 17:13:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 20:14:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 13:56:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 13:09:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-19 17:55:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 15:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:14:52 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 20:27:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 21:41:09 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 10:10:56 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "smaeul": {"quality": "experimental", "status": "unofficial", "name": "smaeul", "description": {"en": "Personal overlay, mainly packages patched for musl compatibility"}, "homepage": "https://github.com/smaeul/portage-overlay", "owner": [{"type": "person", "email": "samuel@sholland.org", "name": "Samuel Holland"}], "source": [{"type": "git", "uri": "https://github.com/smaeul/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/smaeul/portage-overlay.git"}], "feed": ["https://github.com/smaeul/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 21:29:49 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-31 14:42:39 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 19:09:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 15:58:12 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:01:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 19:49:25 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 10:50:29 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:17:16 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 231}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-08 00:31:07 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 330}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 10:25:35 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 03:57:15 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 968}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 22:33:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-21 08:51:06 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 17:05:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 285}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 17:58:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n have the time to commit it to the official tree or do not consider it ready\n for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2020-10-24 13:35:01.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 20:30:21 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-04 03:36:05 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 13:57:40 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "tatsh-overlay": {"quality": "experimental", "status": "unofficial", "name": "tatsh-overlay", "description": {"en": "Overlay from Tatsh - emulators/fonts/game/misc"}, "homepage": "https://github.com/Tatsh/tatsh-overlay", "owner": [{"type": "person", "email": "audvare+overlay@gmail.com", "name": "Andrew Udvare"}], "source": [{"type": "git", "uri": "https://github.com/Tatsh/tatsh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tatsh/tatsh-overlay.git"}], "feed": ["https://github.com/Tatsh/tatsh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:39:45 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 18:17:53 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 00:12:30 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 357}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 02:01:32 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 138}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-02 17:26:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-03-28 19:02:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "homepage": "https://github.com/toniz4/toniz4-overlay.git/", "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:toniz4/toniz4-overlay.git"}], "feed": ["https://github.com/toniz4/toniz4-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:28:35 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 09:11:06 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 11:30:17 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 13:47:56 +0200", "x-masters": ["gentoo"], "x-ebuild-count": 492}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-21 22:16:56 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 14:18:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "unc3nsored": {"quality": "experimental", "status": "unofficial", "name": "unc3nsored", "description": {"en": "Overlay for software I didn't find in the main tree"}, "homepage": "https://github.com/xxc3nsoredxx/unc3nsored", "owner": [{"type": "person", "email": "xxc3ncoredxx@gmail.com", "name": "Oskari Pirhonen"}], "source": [{"type": "git", "uri": "https://github.com/xxc3nsoredxx/unc3nsored.git"}], "feed": ["https://github.com/xxc3nsoredxx/unc3nsored/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 21:39:14 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-28 20:02:41 +1030\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 20:24:41 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 20:47:22 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 22:11:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 302}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 04:57:18 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 67}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:33:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 10:14:16 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-30 20:09:52 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 16:43:33 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 77}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 11:48:58 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 11:22:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 15:08:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "waffle-builds": {"quality": "experimental", "status": "unofficial", "name": "waffle-builds", "description": {"en": "FlyingWaffle's personal ebuild overlay."}, "homepage": "https://github.com/FlyingWaffleDev/waffle-builds", "owner": [{"type": "person", "email": "flyingwaffle@pm.me", "name": "FlyingWaffle"}], "source": [{"type": "git", "uri": "https://github.com/FlyingWaffleDev/waffle-builds.git"}, {"type": "git", "uri": "git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git"}], "feed": ["https://github.com/FlyingWaffleDev/waffle-builds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 10:47:29 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/bsd-ac/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/bsd-ac/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/bsd-ac/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 02:22:20 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 108}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-28 21:28:13 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-26 00:39:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 15:49:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 08:41:09 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 14:22:43 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 251}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-29 21:48:48 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-21 02:49:16 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 23}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:31:57 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-04 07:24:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-17 19:37:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 10:51:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-14 20:51:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:13:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "GOOD", "x-timestamp": "1984-04-04 00:44:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 132}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zseri/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zseri/portage-zscheile.git"}], "feed": ["https://github.com/zseri/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 18:19:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 467}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 17:51:35 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}} \ No newline at end of file
+{"0bs1d1an": {"quality": "experimental", "status": "unofficial", "name": "0bs1d1an", "description": {"en": "Personal overlay"}, "homepage": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay", "owner": [{"type": "person", "email": "gkroon@maelstrom.ninja", "name": "Guido Kroon"}], "source": [{"type": "git", "uri": "https://gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git"}], "feed": ["https://gitlab.com/0bs1d1an/0bs1d1an-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-07-05 16:07:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo", "steam-overlay"], "x-ebuild-count": 79}, "2xsaiko": {"quality": "experimental", "status": "unofficial", "name": "2xsaiko", "description": {"en": "Personal overlay with no special focus"}, "homepage": "https://git.sr.ht/~dblsaiko/ebuilds", "owner": [{"type": "person", "email": "gentoo@dblsaiko.net", "name": "2xsaiko"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~dblsaiko/ebuilds"}, {"type": "git", "uri": "git@git.sr.ht:~dblsaiko/ebuilds"}], "feed": ["https://git.sr.ht/~dblsaiko/ebuilds/log/rss.xml"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:50:06 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 243}, "4nykey": {"quality": "experimental", "status": "unofficial", "name": "4nykey", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/4nykey/4nykey", "owner": [{"type": "person", "email": "4nykey@gmail.com", "name": "Aleksei Kaveshnikov"}], "source": [{"type": "git", "uri": "https://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git://github.com/4nykey/4nykey.git"}, {"type": "git", "uri": "git@github.com:4nykey/4nykey.git"}], "feed": ["https://github.com/4nykey/4nykey/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 13:19:58 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 458}, "AlexandreFournier": {"quality": "experimental", "status": "unofficial", "name": "AlexandreFournier", "description": {"en": "Alexandre Fournier's personal overlay"}, "homepage": "https://github.com/AlexandreFournier/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@alexandrefournier.com", "name": "Alexandre Fournier"}], "source": [{"type": "git", "uri": "https://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/AlexandreFournier/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:AlexandreFournier/gentoo-overlay.git"}], "feed": ["https://github.com/AlexandreFournier/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 17:45:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 58}, "ArchFeh": {"quality": "experimental", "status": "unofficial", "name": "ArchFeh", "description": {"en": "ArchFeh's personal overlay"}, "homepage": "https://github.com/ArchFeh/ArchFeh-overlay", "owner": [{"type": "person", "email": "guyu2876@gmail.com", "name": "ArchFeh"}], "source": [{"type": "git", "uri": "https://github.com/ArchFeh/ArchFeh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ArchFeh/ArchFeh-overlay.git"}], "feed": ["https://github.com/ArchFeh/ArchFeh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-22 15:59:45 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "AstroFloyd": {"quality": "experimental", "status": "unofficial", "name": "AstroFloyd", "description": {"en": "AstroFloyd's Gentoo overlay"}, "homepage": "https://cgit.gentoo.org/user/AstroFloyd.git/", "owner": [{"type": "person", "email": "AstroFloyd@gmail.com", "name": "AstroFloyd"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AstroFloyd.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AstroFloyd.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AstroFloyd.git"}], "feed": ["https://cgit.gentoo.org/user/AstroFloyd.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-05 17:32:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "AzP": {"quality": "experimental", "status": "unofficial", "name": "AzP", "description": {"en": "Peter's own software playground"}, "homepage": "https://cgit.gentoo.org/user/AzP.git/", "owner": [{"type": "person", "email": "peterasplund@gentoo.se", "name": "Peter Asplund"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/AzP.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/AzP.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/AzP.git"}], "feed": ["https://cgit.gentoo.org/user/AzP.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-28 21:11:16 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "Case_Of": {"quality": "experimental", "status": "unofficial", "name": "Case_Of", "description": {"en": "Personal overlay"}, "homepage": "https://framagit.org/Case_Of/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo@retornaz.com", "name": "Quentin Retornaz"}], "source": [{"type": "git", "uri": "https://framagit.org/Case_Of/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git"}], "feed": ["https://framagit.org/Case_Of/gentoo-overlay/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 00:16:11 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "Drauthius": {"quality": "experimental", "status": "unofficial", "name": "Drauthius", "description": {"en": "Ebuilds related to game dev"}, "homepage": "https://cgit.gentoo.org/repo/user/Drauthius.git/", "owner": [{"type": "person", "email": "albert@diserholt.com", "name": "Albert Diserholt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/Drauthius.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/Drauthius"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/Drauthius.git"}], "feed": ["https://cgit.gentoo.org/repo/user/Drauthius.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-17 16:30:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "DuPol": {"quality": "experimental", "status": "unofficial", "name": "DuPol", "description": {"en": "DuPol's own and modified portage ebuilds."}, "homepage": "https://cgit.gentoo.org/user/DuPol.git/", "owner": [{"type": "person", "email": "DuPol@gmx.de", "name": "Dustin Polke"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/DuPol.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/DuPol.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/DuPol.git"}], "feed": ["https://cgit.gentoo.org/user/DuPol.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-18 21:05:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "FireBurn": {"quality": "experimental", "status": "unofficial", "name": "FireBurn", "description": {"en": "32bit ebuilds (libdrm, mesa, libx11, mesa-progs, ..)"}, "homepage": "https://github.com/FireBurn/Overlay", "owner": [{"type": "person", "email": "mike@fireburn.co.uk", "name": "Mike Lothian"}], "source": [{"type": "git", "uri": "git://github.com/FireBurn/Overlay.git"}], "feed": ["https://github.com/FireBurn/Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 18:53:13 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "HomeAssistantRepository": {"quality": "experimental", "status": "unofficial", "name": "HomeAssistantRepository", "description": {"en": "Home Assistant on Gentoo Linux without virtualenv or docker."}, "homepage": "https://git.edevau.net/onkelbeh/HomeAssistantRepository", "owner": [{"type": "person", "email": "b@edevau.net", "name": "Andreas Billmeier"}], "source": [{"type": "git", "uri": "https://git.edevau.net/onkelbeh/HomeAssistantRepository.git"}, {"type": "git", "uri": "https://github.com/onkelbeh/HomeAssistantRepository.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-21 09:08:43 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2741}, "JRG": {"quality": "experimental", "status": "unofficial", "name": "JRG", "description": {"en": "John's Collaboration Overlay"}, "homepage": "https://github.com/john-r-graham/jrg-overlay", "owner": [{"type": "person", "email": "john_r_graham@gentoo.org", "name": "John R. Graham"}], "source": [{"type": "git", "uri": "https://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git://github.com/john-r-graham/jrg-overlay.git"}, {"type": "git", "uri": "git@github.com:john-r-graham/jrg-overlay.git"}], "feed": ["https://github.com/john-r-graham/jrg-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-31 14:10:23 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "KBrown-pub": {"quality": "experimental", "status": "unofficial", "name": "KBrown-pub", "description": {"en": "KBrown's public overlay"}, "homepage": "http://sandino.araico.net/", "owner": [{"type": "person", "email": "sandino@sandino.net", "name": "Sandino Araico Sanchez"}], "source": [{"type": "git", "uri": "https://git.softwarelibre.mx/KBrown/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/KenjiBrown/gentoo-overlay.git"}], "feed": ["https://git.softwarelibre.mx/KBrown/gentoo-overlay/-/commits/KBrown-pub?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 17:43:33 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 125}, "ROKO__": {"quality": "experimental", "status": "unofficial", "name": "ROKO__", "description": {"en": "Unofficial ebuilds for gentoo based distributions."}, "homepage": "https://github.com/sandikata/ROKO__", "owner": [{"type": "person", "email": "sandikata@yandex.ru", "name": "Alexandrow Rosen"}], "source": [{"type": "git", "uri": "https://github.com/sandikata/ROKO__.git"}, {"type": "git", "uri": "git://github.com/sandikata/ROKO__.git"}], "feed": ["https://github.com/sandikata/ROKO__/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 09:39:51 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 110}, "R_Overlay": {"quality": "experimental", "status": "official", "name": "R_Overlay", "description": {"en": "Gentoo overlay of R packages"}, "homepage": "https://cgit.gentoo.org/proj/R_overlay.git/", "owner": [{"type": "person", "email": "heroxbd@gentoo.org", "name": "Benda Xu"}], "source": [{"type": "rsync", "uri": "rsync://roverlay.dev.gentoo.org/roverlay"}], "x-state": "GOOD", "x-timestamp": "2020-08-14 09:27:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 21017}, "SwordArMor": {"quality": "experimental", "status": "unofficial", "name": "SwordArMor", "description": {"en": "Personnal overlay of alarig/SwordArMor"}, "homepage": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay", "owner": [{"type": "person", "email": "alarig@swordarmor.fr", "name": "Alarig Le Lay"}], "source": [{"type": "git", "uri": "https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git"}], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "ace": {"quality": "experimental", "status": "unofficial", "name": "ace", "description": {"en": "Personal overlay with ebuilds that were missing at one point or another"}, "homepage": "https://github.com/ananace/overlay", "owner": [{"type": "person", "email": "ace@haxalot.com", "name": "Alexander Olofsson"}], "source": [{"type": "git", "uri": "https://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git://github.com/ananace/overlay.git"}, {"type": "git", "uri": "git@github.com:ananace/overlay.git"}], "feed": ["https://github.com/ananace/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 10:42:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 31}, "activehome": {"quality": "experimental", "status": "unofficial", "name": "activehome", "description": {"en": "Gentoo overlay for ebuilds related to 'hand-made' Active Home construction", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f ebuild'\u043e\u0432 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435\u043c \u0441\u0430\u043c\u043e\u0434\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0443\u043c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0430"}, "homepage": "https://cgit.gentoo.org/user/activehome.git/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/activehome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/activehome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/activehome.git"}], "feed": ["https://cgit.gentoo.org/user/activehome.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-07-21 16:01:39 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "aeon-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "aeon-gentoo-overlay", "description": {"en": "Gentoo overlay for Aeon Dev packages and dependencies"}, "homepage": "https://github.com/aeon-engine/aeon-gentoo-overlay", "owner": [{"type": "person", "email": "robindegen@gmail.com", "name": "Robin Degen"}], "source": [{"type": "git", "uri": "https://github.com/aeon-engine/aeon-gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/aeon-engine/aeon-gentoo-overlay.git"}], "feed": ["https://github.com/aeon-engine/aeon-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-05-19 12:32:23 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ag-ops": {"quality": "experimental", "status": "unofficial", "name": "ag-ops", "description": {"en": "Useful tools for SysAdmins or DevOps"}, "homepage": "https://gitlab.com/ILMostro/ag-ops", "owner": [{"type": "person", "email": "ilmostro7@gmail.com", "name": "John Johnson"}], "source": [{"type": "git", "uri": "https://gitlab.com/ILMostro/ag-ops.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/ILMostro/ag-ops.git"}], "feed": ["https://gitlab.com/ILMostro/ag-ops/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-10 03:08:50 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "ago": {"quality": "experimental", "status": "official", "name": "ago", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/ago.git/", "owner": [{"type": "person", "email": "ago@gentoo.org", "name": "Agostino Sarubbo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ago.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ago.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ago.git"}], "feed": ["https://cgit.gentoo.org/dev/ago.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-10 16:28:13 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "ahyangyi-overlay": {"quality": "experimental", "status": "unofficial", "name": "ahyangyi-overlay", "description": {"en": "Ahyangyi's overlay"}, "homepage": "https://github.com/ahyangyi/ahyangyi-overlay", "owner": [{"type": "person", "email": "ahyangyi@gmail.com", "name": "Yi Yang"}], "source": [{"type": "git", "uri": "https://github.com/ahyangyi/ahyangyi-overlay.git"}], "feed": ["https://github.com/ahyangyi/ahyangyi-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-14 22:02:51 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "alatar-lay": {"quality": "experimental", "status": "unofficial", "name": "alatar-lay", "description": {"en": "Alatar`s personal ebuilds"}, "homepage": "https://github.com/alatarum/alatar-lay", "owner": [{"type": "person", "email": "alatar_@list.ru", "name": "Alatar"}], "source": [{"type": "git", "uri": "https://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git://github.com/alatarum/alatar-lay.git"}, {"type": "git", "uri": "git@github.com:alatarum/alatar-lay.git"}], "feed": ["https://github.com/alatarum/alatar-lay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 23:02:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "alesharik": {"quality": "experimental", "status": "unofficial", "name": "alesharik", "description": {"en": "Gentoo portage overlay of alesharik"}, "homepage": "https://github.com/alesharik/alesharik-overlay", "owner": [{"type": "person", "email": "alesharik4@gmail.com", "name": "Aleksei Arsenev"}], "source": [{"type": "git", "uri": "https://github.com/alesharik/alesharik-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/alesharik/alesharik-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-07 14:18:42 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "alexcepoi": {"quality": "experimental", "status": "unofficial", "name": "alexcepoi", "description": {"en": "Personal User Overlay"}, "homepage": "https://cgit.gentoo.org/user/alexcepoi.git/", "owner": [{"type": "person", "email": "alex.cepoi@gmail.com", "name": "Alexandru Cepoi"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/alexcepoi.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/alexcepoi.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/alexcepoi.git"}], "feed": ["https://cgit.gentoo.org/user/alexcepoi.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-01-21 15:49:24 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "alexxy": {"quality": "experimental", "status": "official", "name": "alexxy", "description": {"en": "Some random work in progress stuff from alexxy"}, "homepage": "https://cgit.gentoo.org/dev/alexxy.git", "owner": [{"type": "person", "email": "alexxy@gentoo.org", "name": "Alexey Shvetsov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/alexxy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/alexxy.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/alexxy.git"}], "feed": ["https://cgit.gentoo.org/dev/alexxy.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-11 14:50:24 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "aluco": {"quality": "experimental", "status": "unofficial", "name": "aluco", "description": {"en": "From drm-next to phoronix-test-suite ebuilds"}, "homepage": "https://cgit.gentoo.org/user/aluco.git/", "owner": [{"type": "person", "email": "anthoine.bourgeois@gmail.com", "name": "Anthoine Bourgeois"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/aluco.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/aluco.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/aluco.git"}], "feed": ["https://cgit.gentoo.org/user/aluco.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-05-22 00:05:14 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "alxu": {"quality": "experimental", "status": "unofficial", "name": "alxu", "description": {"en": "Alex Xu (Hello71) personal overlay"}, "homepage": "https://cgit.alxu.ca/gentoo-overlay.git/", "owner": [{"type": "person", "email": "alex_y_xu@yahoo.ca", "name": "Alex Xu (Hello71)"}], "source": [{"type": "git", "uri": "https://git.alxu.ca/gentoo-overlay.git"}], "feed": ["https://cgit.alxu.ca/gentoo-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-16 18:51:36 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 51}, "amedeos": {"quality": "experimental", "status": "unofficial", "name": "amedeos", "description": {"en": "amedeos's personal overlay"}, "homepage": "https://github.com/amedeos/amedeos-overlay", "owner": [{"type": "person", "email": "amedeo@linux.com", "name": "Amedeo Salvati"}], "source": [{"type": "git", "uri": "https://github.com/amedeos/amedeos-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/amedeos/amedeos-overlay.git"}], "feed": ["https://github.com/amedeos/amedeos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-07 10:40:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "anarchy": {"quality": "experimental", "status": "official", "name": "anarchy", "description": {"en": "Testing/Bug fixes, new ebuilds"}, "homepage": "https://cgit.gentoo.org/dev/anarchy.git/", "owner": [{"type": "person", "email": "anarchy@gentoo.org", "name": "Jory Pratt"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/anarchy.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/anarchy"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/anarchy.git"}], "feed": ["https://cgit.gentoo.org/dev/anarchy.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-15 16:34:50 -0600\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "anard": {"quality": "experimental", "status": "unofficial", "name": "anard", "description": {"en": "Anard's personnal repository, with some new ebuilds"}, "homepage": "https://github.com/Anard/anard-overlay", "owner": [{"type": "person", "email": "anard@free.fr", "name": "Anard"}], "source": [{"type": "git", "uri": "https://github.com/Anard/anard-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Anard/anard-overlay.git"}], "feed": ["https://github.com/Anard/anard-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-08 14:02:45 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anaximander": {"quality": "experimental", "status": "unofficial", "name": "anaximander", "description": {"en": "anaximander's user overlay"}, "homepage": "https://cgit.gentoo.org/user/anaximander.git/", "owner": [{"type": "person", "email": "dominik.kriegner+gentoo@gmail.com", "name": "Dominik Kriegner"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/anaximander.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/anaximander.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/anaximander.git"}], "feed": ["https://cgit.gentoo.org/user/anaximander.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-23 08:35:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "anders-larsson": {"quality": "experimental", "status": "unofficial", "name": "anders-larsson", "description": {"en": "A few packages that are not hosted elsewhere."}, "homepage": "https://github.com/anders-larsson/gentoo-overlay", "owner": [{"type": "person", "email": "andla@thethundertemplars.com", "name": "Anders Larsson"}], "source": [{"type": "git", "uri": "https://github.com/anders-larsson/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 21:08:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "andrey_utkin": {"quality": "experimental", "status": "official", "name": "andrey_utkin", "description": {"en": "Developer overlay"}, "homepage": "https://github.com/andrey-utkin/gentoo-overlay.git", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "andrey_utkin"}], "source": [{"type": "git", "uri": "https://github.com/andrey-utkin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/andrey-utkin/gentoo-overlay.git"}], "feed": ["https://github.com/andrey-utkin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-04 11:23:21 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "anomen": {"quality": "experimental", "status": "unofficial", "name": "anomen", "description": {"en": "anomen's personal Gentoo overlay"}, "homepage": "https://github.com/anomen-s/anomen-overlay", "owner": [{"type": "person", "email": "ludek_h@seznam.cz", "name": "anomen"}], "source": [{"type": "git", "uri": "https://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git://github.com/anomen-s/anomen-overlay.git"}, {"type": "git", "uri": "git@github.com:anomen-s/anomen-overlay.git"}], "feed": ["https://github.com/anomen-s/anomen-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-28 20:54:26 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "anyc": {"quality": "experimental", "status": "unofficial", "name": "anyc", "description": {"en": "Testing ebuilds for out-of-tree applications"}, "homepage": "https://github.com/anyc/anyc-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/anyc-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/anyc-overlay.git"}], "feed": ["https://github.com/anyc/anyc-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-22 09:36:20 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 79}, "apriluwu": {"quality": "experimental", "status": "unofficial", "name": "apriluwu", "description": {"en": "apriluwu's personal overlay"}, "homepage": "https://github.com/apriluwu/gentoo-overlay", "owner": [{"type": "person", "email": "aaprilthemonth@gmail.com", "name": "April C."}], "source": [{"type": "git", "uri": "https://github.com/apriluwu/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/apriluwu/gentoo-overlay.git"}], "feed": ["https://github.com/apriluwu/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-27 13:41:25 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "archenroot": {"quality": "experimental", "status": "unofficial", "name": "archenroot", "description": {"en": "GPU, Neural Networks, Big Data, HPC, Java"}, "homepage": "https://github.com/archenroot/gentoo-overlay", "owner": [{"type": "person", "email": "archenroot@gmail.com", "name": "Ladislav Jech"}], "source": [{"type": "git", "uri": "https://github.com/archenroot/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/archenroot/gentoo-overlay.git"}], "feed": ["https://github.com/archenroot/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-05-16 09:43:27 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "argent-main": {"quality": "experimental", "status": "unofficial", "name": "argent-main", "description": {"en": "Argent Linux"}, "homepage": "https://gitlab.com/argent/argent-main", "owner": [{"type": "person", "email": "stefan.cristian+gentoo@rogentos.ro", "name": "Stefan Cristian Brindusa"}], "source": [{"type": "git", "uri": "https://gitlab.com/argent/argent-main.git"}], "feed": ["https://gitlab.com/argent/argent-main/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 00:55:19 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2118}, "arx-libertatis": {"quality": "experimental", "status": "unofficial", "name": "arx-libertatis", "description": {"en": "Arx Libertatis Overlay"}, "homepage": "https://github.com/arx/ArxGentoo", "owner": [{"type": "person", "email": "daniel@constexpr.org", "name": "Daniel Scharrer"}], "source": [{"type": "git", "uri": "https://github.com/arx/ArxGentoo.git"}, {"type": "git", "uri": "git://github.com/arx/ArxGentoo.git"}], "x-state": "GOOD", "x-timestamp": "2020-08-11 21:12:11 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "audio-overlay": {"quality": "experimental", "status": "unofficial", "name": "audio-overlay", "description": {"en": "Pro audio overlay. Please file bugs or package suggestions at https://github.com/gentoo-audio/audio-overlay/issues/new"}, "homepage": "https://github.com/gentoo-audio/audio-overlay", "owner": [{"type": "project", "email": "audio-overlay@googlegroups.com", "name": "Audio overlay"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo-audio/audio-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo-audio/audio-overlay.git"}], "feed": ["https://github.com/gentoo-audio/audio-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:25:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 78}, "average": {"quality": "experimental", "status": "unofficial", "name": "average", "description": {"en": "Personal playground for some ebuilds not found elsewhere"}, "homepage": "https://github.com/AnAverageHuman/average", "owner": [{"type": "person", "email": "jeffrey@icurse.nl", "name": "Jeffrey Lin"}], "source": [{"type": "git", "uri": "https://github.com/AnAverageHuman/average.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AnAverageHuman/average.git"}], "feed": ["https://github.com/AnAverageHuman/average/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 23:33:21 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "awesome": {"quality": "experimental", "status": "unofficial", "name": "awesome", "description": {"en": "Awesome ebuilds"}, "homepage": "https://gitlab.awesome-it.de/overlays/awesome", "owner": [{"type": "person", "email": "info@awesome-it.de", "name": "Daniel Morlock"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/awesome.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-02 08:59:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "barnowl": {"quality": "experimental", "status": "unofficial", "name": "barnowl", "description": {"en": "BarnOwl IM client"}, "homepage": "https://github.com/wthrowe/barnowl-overlay", "owner": [{"type": "person", "email": "wtt6@cornell.edu", "name": "William Throwe"}], "source": [{"type": "git", "uri": "https://github.com/wthrowe/barnowl-overlay.git"}, {"type": "git", "uri": "git://github.com/wthrowe/barnowl-overlay.git"}], "feed": ["https://github.com/wthrowe/barnowl-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-12 02:13:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "beatussum-overlay": {"quality": "experimental", "status": "unofficial", "name": "beatussum-overlay", "description": {"en": "Beatussum's overlay", "fr": "Overlay de Beatussum"}, "longdescription": {"en": "\n My Gentoo overlay aims to provide some packages that are not (yet) in the main Gentoo tree.\n ", "fr": "\n Mon overlay a pour but de fournir certains paquets qui ne sont pas (encore) disponibles dans l'arbre principal.\n "}, "homepage": "https://github.com/beatussum/beatussum-overlay", "owner": [{"type": "person", "email": "beatussum@protonmail.com", "name": "Matt\u00e9o Rossillol--Laruelle"}], "source": [{"type": "git", "uri": "https://github.com/beatussum/beatussum-overlay.git"}, {"type": "git", "uri": "ssh://git@github.com/beatussum/beatussum-overlay.git"}], "feed": ["https://github.com/beatussum/beatussum-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 15:47:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "benzene-overlay": {"quality": "experimental", "status": "unofficial", "name": "benzene-overlay", "description": {"en": "Universebenzene's personal Gentoo overlay"}, "homepage": "https://github.com/Universebenzene/benzene-overlay", "owner": [{"type": "person", "email": "universebenzene@sina.com", "name": "Universebenzene"}], "source": [{"type": "git", "uri": "https://github.com/Universebenzene/benzene-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Universebenzene/benzene-overlay.git"}], "feed": ["https://github.com/Universebenzene/benzene-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 21:21:39 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "bes": {"quality": "experimental", "status": "unofficial", "name": "bes", "description": {"en": "bes' personal overlay"}, "homepage": "https://github.com/bes-internal/gentoo-overlay-bes", "owner": [{"type": "person", "email": "bes.internal@gmail.com", "name": "Vladimir Varlamov"}], "source": [{"type": "git", "uri": "https://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git://github.com/bes-internal/gentoo-overlay-bes.git"}, {"type": "git", "uri": "git@github.com:bes-internal/gentoo-overlay-bes.git"}], "feed": ["https://github.com/bes-internal/gentoo-overlay-bes/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-14 13:34:07 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "bezerker": {"quality": "experimental", "status": "unofficial", "name": "bezerker", "description": {"en": "Bezerker's Packages"}, "homepage": "https://github.com/bezerker/gentoo-overlay", "owner": [{"type": "person", "email": "bezerker@bezerker.org", "name": "Bezerker"}], "source": [{"type": "git", "uri": "https://github.com/bezerker/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-09-04 06:56:43 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bibletime": {"quality": "experimental", "status": "unofficial", "name": "bibletime", "description": {"en": "BibleTime overlay"}, "homepage": "https://cgit.gentoo.org/user/bibletime.git/", "owner": [{"type": "person", "email": "jaak@ristioja.ee", "name": "Jaak Ristioja"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/bibletime.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/bibletime.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/bibletime.git"}], "feed": ["https://cgit.gentoo.org/user/bibletime.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-02 21:35:41 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "binaryden": {"quality": "experimental", "status": "unofficial", "name": "binaryden", "description": {"en": "Overlay for Cinnamon and other Gentoo packages"}, "homepage": "https://github.com/tkemmer/binaryden", "owner": [{"type": "person", "email": "thomas@binaryden.de", "name": "Thomas Kemmer"}], "source": [{"type": "git", "uri": "https://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git://github.com/tkemmer/binaryden.git"}, {"type": "git", "uri": "git+ssh://git@github.com/tkemmer/binaryden.git"}], "feed": ["https://github.com/tkemmer/binaryden/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:22:29 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "bircoph": {"quality": "experimental", "status": "official", "name": "bircoph", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/bircoph.git/", "owner": [{"type": "person", "email": "bircoph@gentoo.org", "name": "Andrew Savchenko"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/bircoph.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/bircoph.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/bircoph.git"}], "feed": ["https://cgit.gentoo.org/dev/bircoph.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-28 16:44:20 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "bitcetera": {"quality": "experimental", "status": "unofficial", "name": "bitcetera", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/svoop/bitcetera-overlay", "owner": [{"type": "person", "email": "gentoo@bitcetera.com", "name": "Sven Schwyn"}], "source": [{"type": "git", "uri": "https://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git://github.com/svoop/bitcetera-overlay.git"}, {"type": "git", "uri": "git@github.com:svoop/bitcetera-overlay.git"}], "feed": ["https://github.com/svoop/bitcetera-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 19:57:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "bitcoin": {"quality": "experimental", "status": "unofficial", "name": "bitcoin", "description": {"en": "Bitcoin and CPU/GPU mining related ebuilds"}, "homepage": "https://gitlab.com/bitcoin/gentoo.git", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/bitcoin/gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 00:05:00 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 154}, "bleeding-edge": {"quality": "experimental", "status": "unofficial", "name": "bleeding-edge", "description": {"en": "Gentoo ebuilds for \"bleeding edge\" versions of packages - newest, untested - running on ~amd64."}, "homepage": "https://cgit.gentoo.org/repo/user/bleeding-edge.git/", "owner": [{"type": "person", "email": "jasiupsota@gmail.com", "name": "Jan Psota"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/bleeding-edge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/bleeding-edge"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git"}], "feed": ["https://cgit.gentoo.org/repo/user/bleeding-edge.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2018-09-26 10:53:10 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "blender-gentoo-logo": {"quality": "experimental", "status": "official", "name": "blender-gentoo-logo", "description": {"en": "Software needed to render the Blender-based gentoo Logo of 2003"}, "homepage": "https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/blender-gentoo-logo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2017-09-09 16:34:22 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "bloody": {"quality": "experimental", "status": "unofficial", "name": "bloody", "description": {"en": "krita bleeding edge and artists tools/resources"}, "homepage": "https://github.com/bloodywing/bloody", "owner": [{"type": "person", "email": "bloodywing@neocomy.net", "name": "Pierre Geier"}], "source": [{"type": "git", "uri": "https://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git://github.com/bloodywing/bloody.git"}, {"type": "git", "uri": "git@github.com:bloodywing/bloody.git"}], "feed": ["https://github.com/bloodywing/bloody/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-30 13:09:33 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bobwya": {"quality": "experimental", "status": "unofficial", "name": "bobwya", "description": {"en": "Miscellaneous Gentoo ebuilds"}, "homepage": "https://github.com/bobwya/miscellaneous_ebuilds", "owner": [{"type": "person", "email": "bob.mt.wya@gmail.com", "name": "Bob Wya"}], "source": [{"type": "git", "uri": "https://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git://github.com/bobwya/miscellaneous_ebuilds.git"}, {"type": "git", "uri": "git@github.com:bobwya/miscellaneous_ebuilds.git"}], "feed": ["https://github.com/bobwya/miscellaneous_ebuilds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 16:51:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 463}, "bombo82": {"quality": "experimental", "status": "unofficial", "name": "bombo82", "description": {"en": "Bombo82's own gentoo overlay"}, "homepage": "https://github.com/bombo82/bombo82-overlay", "owner": [{"type": "person", "email": "bombo82@giannibombelli.it", "name": "Gianni Bombelli (bombo82)"}], "source": [{"type": "git", "uri": "https://github.com/bombo82/bombo82-overlay.git"}, {"type": "git", "uri": "git@github.com:bombo82/bombo82-overlay.git"}], "feed": ["https://github.com/bombo82/bombo82-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 13:29:41 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "booboo": {"quality": "experimental", "status": "unofficial", "name": "booboo", "description": {"en": "L29Ah personal overlay"}, "homepage": "https://github.com/l29ah/booboo", "owner": [{"type": "person", "email": "zl29ah@gmail.com", "name": "Sergey Alirzaev"}], "source": [{"type": "git", "uri": "https://github.com/l29ah/booboo.git"}], "feed": ["https://github.com/l29ah/booboo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 05:11:06 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 376}, "brave-overlay": {"quality": "experimental", "status": "unofficial", "name": "brave-overlay", "description": {"en": "Brave Overlay"}, "homepage": "https://gitlab.com/jason.oliveira/brave-overlay", "owner": [{"type": "person", "email": "jason.oliveira@medicalcannab.is", "name": "Jason Oliveira"}], "source": [{"type": "git", "uri": "https://gitlab.com/jason.oliveira/brave-overlay.git"}], "feed": ["https://gitlab.com/jason.oliveira/brave-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 21:05:25 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "bright": {"quality": "experimental", "status": "unofficial", "name": "bright", "description": {"en": "BrightOne's personal overlay"}, "homepage": "https://github.com/filalex77/bright", "owner": [{"type": "person", "email": "brightone@protonmail.com", "name": "Oleksii Filonenko"}], "source": [{"type": "git", "uri": "https://github.com/filalex77/bright.git"}], "feed": ["https://github.com/filalex77/bright/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-07-25 22:54:21 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "brother-overlay": {"quality": "experimental", "status": "unofficial", "name": "brother-overlay", "description": {"en": "Brother printer and scanner software"}, "homepage": "https://github.com/stefan-langenmaier/brother-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/brother-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/brother-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/brother-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-03 21:04:52 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 570}, "bubba": {"quality": "experimental", "status": "unofficial", "name": "bubba", "description": {"en": "\"Bubba\" platform support for Excito B2|3"}, "homepage": "https://github.com/gordonb3/bubba-overlay", "owner": [{"type": "person", "email": "gordon@bosvangennip.nl", "name": "Gordon Bos"}], "source": [{"type": "git", "uri": "https://github.com/gordonb3/bubba-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 16:36:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "bumblebee": {"quality": "experimental", "status": "unofficial", "name": "bumblebee", "description": {"en": "Packages related to the bumblebee project"}, "homepage": "https://github.com/Bumblebee-Project/bumblebee-gentoo/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/Bumblebee-Project/bumblebee-gentoo"}], "feed": ["https://github.com/Bumblebee-Project/bumblebee-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-17 00:03:28 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "buzden": {"quality": "experimental", "status": "unofficial", "name": "buzden", "description": {"en": "Personal overlay of Denis Buzdalov"}, "homepage": "https://github.com/buzden/buzden-overlay", "owner": [{"type": "person", "email": "public@buzden.ru", "name": "Denis Buzdalov"}], "source": [{"type": "git", "uri": "https://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git://github.com/buzden/buzden-overlay.git"}, {"type": "git", "uri": "git@github.com:buzden/buzden-overlay.git"}], "feed": ["https://github.com/buzden/buzden-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:40:07 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "calculate": {"quality": "experimental", "status": "unofficial", "name": "calculate", "description": {"en": "Calculate Overlay"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/calculate-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:27:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 240}, "canutethegreat-overlay": {"quality": "experimental", "status": "unofficial", "name": "canutethegreat-overlay", "description": {"en": "Overlay for personal projects, forks, and customizations"}, "homepage": "http://gentoo.canutethegreat.com/", "owner": [{"type": "person", "email": "canutethegreat@gmail.com", "name": "Ronald Farrer"}], "source": [{"type": "git", "uri": "https://github.com/CanuteTheGreat/canutethegreat-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/CanuteTheGreat/canutethegreat-overlay.git"}], "feed": ["https://github.com/CanuteTheGreat/canutethegreat-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-11 12:32:26 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ceamac": {"quality": "experimental", "status": "unofficial", "name": "ceamac", "description": {"en": "This is a small Gentoo overlay with ebuilds that I could not find elsewhere or that I had to modify for some reason."}, "homepage": "https://github.com/ceamac/overlay", "owner": [{"type": "person", "email": "ceamac.paragon@gmail.com", "name": "Viorel Munteanu"}], "source": [{"type": "git", "uri": "https://github.com/ceamac/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ceamac/overlay.git"}], "feed": ["https://github.com/ceamac/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-13 19:38:00 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "certbot-dns-plugins": {"quality": "experimental", "status": "unofficial", "name": "certbot-dns-plugins", "description": {"en": "Overlay for the DNS plugins of the ACME client certbot"}, "homepage": "https://github.com/osirisinferi/certbot-dns-plugins-overlay", "owner": [{"type": "person", "email": "gentoo@flut.demon.nl", "name": "Osiris Inferi"}], "source": [{"type": "git", "uri": "https://github.com/osirisinferi/certbot-dns-plugins-overlay.git"}, {"type": "git", "uri": "git@github.com:osirisinferi/certbot-dns-plugins-overlay.git"}], "feed": ["https://github.com/osirisinferi/certbot-dns-plugins-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 21:10:02 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "cg": {"quality": "experimental", "status": "unofficial", "name": "cg", "description": {"en": "Computer graphics ebuilds for gentoo"}, "homepage": "https://github.com/brothermechanic/cg", "owner": [{"type": "person", "email": "brothermechanic@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/brothermechanic/cg.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 02:19:23 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 116}, "chrisadr": {"quality": "experimental", "status": "unofficial", "name": "chrisadr", "description": {"en": "ChrisADR's personal overlay"}, "homepage": "https://github.com/ChrisADR/chrisadr-overlay", "owner": [{"type": "person", "email": "chrisadr@gentoo.org", "name": "Christopher D\u00edaz Riveros"}], "source": [{"type": "git", "uri": "https://github.com/ChrisADR/chrisadr-overlay.git"}, {"type": "git", "uri": "git@github.com:ChrisADR/chrisadr-overlay.git"}], "feed": ["https://github.com/ChrisADR/chrisadr-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2018-05-17 20:48:42 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "chrytoo": {"quality": "experimental", "status": "unofficial", "name": "chrytoo", "description": {"en": "Personal overlay for packages that usually aren't in the official repository..."}, "homepage": "https://github.com/chrytoo/gentoo-overlay", "owner": [{"type": "person", "email": "chry7oo@gmail.com", "name": "Milo\u0161 \u0110. Omeragi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/chrytoo/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:chrytoo/gentoo-overlay.git"}], "feed": ["https://github.com/chrytoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-08-19 00:07:33 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "chymeric": {"quality": "experimental", "status": "unofficial", "name": "chymeric", "description": {"en": "Overlay for scientific software and other utilities"}, "homepage": "https://github.com/TheChymera/overlay", "owner": [{"type": "person", "email": "chr@chymera.eu", "name": "Horea Christian"}], "source": [{"type": "git", "uri": "https://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git://github.com/TheChymera/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TheChymera/overlay.git"}], "feed": ["https://github.com/TheChymera/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-16 11:11:32 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "science"], "x-ebuild-count": 35}, "cj-overlay": {"quality": "experimental", "status": "official", "name": "cj-overlay", "description": {"en": "Christoph's Overlay"}, "homepage": "https://github.com/junghans/cj-overlay", "owner": [{"type": "person", "email": "junghans@gentoo.org"}], "source": [{"type": "git", "uri": "git://github.com/junghans/cj-overlay"}], "feed": ["https://github.com/junghans/cj-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-11-08 11:12:00 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "concaveoverlay": {"quality": "experimental", "status": "unofficial", "name": "concaveoverlay", "description": {"en": "concavegit's overlay."}, "homepage": "https://gitlab.com/concavegit/concaveoverlay", "owner": [{"type": "person", "email": "concavemail@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/concavegit/concaveoverlay.git"}], "feed": ["https://gitlab.com/concavegit/concaveoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-11-23 19:42:16 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "cosmicmod": {"quality": "experimental", "status": "unofficial", "name": "cosmicmod", "description": {"en": "CosmicMod Gentoo Overlay"}, "homepage": "https://github.com/cosmicoz/gentoo-overlay", "owner": [{"type": "person", "email": "oz@cosmicmod.net", "name": "Oz"}], "source": [{"type": "git", "uri": "https://github.com/cosmicoz/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-21 17:06:37 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "crocket-overlay": {"quality": "experimental", "status": "unofficial", "name": "crocket-overlay", "description": {"en": "crocket's personal overlay"}, "homepage": "https://github.com/crocket/crocket-overlay", "owner": [{"type": "person", "email": "crockabiscuit@gmail.com", "name": "crocket"}], "source": [{"type": "git", "uri": "https://github.com/crocket/crocket-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/crocket/crocket-overlay.git"}], "feed": ["https://github.com/crocket/crocket-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 10:12:09 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "crossdev": {"quality": "experimental", "status": "unofficial", "name": "crossdev", "description": {"en": "Ebuilds for embedded systems", "ru": "\u041f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0441\u0438\u0441\u0442\u0435\u043c"}, "homepage": "https://github.com/alphallc/crossdev/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "git://github.com/alphallc/crossdev"}], "feed": ["https://github.com/alphallc/crossdev/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-06-18 14:39:51 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "dMaggot": {"quality": "experimental", "status": "unofficial", "name": "dMaggot", "description": {"en": "Overlay of David E. Narv\u00e1ez"}, "homepage": "https://cgit.gentoo.org/user/dMaggot.git/", "owner": [{"type": "person", "email": "david.narvaez@computer.org", "name": "David E. Narv\u00e1ez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/dMaggot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/dMaggot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/dMaggot.git"}], "feed": ["https://cgit.gentoo.org/user/dMaggot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2017-06-01 22:09:38 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "dargor": {"quality": "experimental", "status": "unofficial", "name": "dargor", "description": {"en": "Personal overlay for packages I care of"}, "homepage": "https://github.com/dargor/dargor_gentoo_overlay", "owner": [{"type": "person", "email": "linder.gabriel@gmail.com", "name": "Gabriel Linder"}], "source": [{"type": "git", "uri": "https://github.com/dargor/dargor_gentoo_overlay.git"}, {"type": "git", "uri": "git@github.com:dargor/dargor_gentoo_overlay.git"}], "feed": ["https://github.com/dargor/dargor_gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 10:14:08 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "darkelf": {"quality": "experimental", "status": "unofficial", "name": "darkelf", "description": {"en": "Overlay focusing on improved user experience for working in darkness on Xfce or zsh (including vim)"}, "homepage": "https://cgit.gentoo.org/repo/user/darkelf.git", "owner": [{"type": "person", "email": "sur3@gmx.de", "name": "Simon"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/darkelf.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/darkelf.git"}], "feed": ["https://cgit.gentoo.org/repo/user/darkelf.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-21 18:45:53 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "darthgandalf-overlay": {"quality": "experimental", "status": "unofficial", "name": "darthgandalf-overlay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/DarthGandalf/gentoo-overlay", "owner": [{"type": "person", "email": "alexey+gentoo@asokolov.org", "name": "Alexey Sokolov"}], "source": [{"type": "git", "uri": "https://github.com/DarthGandalf/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/DarthGandalf/gentoo-overlay.git"}], "feed": ["https://github.com/DarthGandalf/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 12:03:43 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "decent-im": {"quality": "experimental", "status": "unofficial", "name": "decent-im", "description": {"en": "XMPP software overlay maintained by decent.im"}, "homepage": "https://github.com/decent-im/gentoo-overlay", "owner": [{"type": "person", "email": "andrey_utkin@gentoo.org", "name": "Andrey Utkin"}], "source": [{"type": "git", "uri": "https://github.com/decent-im/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/decent-im/gentoo-overlay.git"}], "feed": ["https://github.com/decent-im/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-09-17 18:48:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "deepin": {"quality": "experimental", "status": "unofficial", "name": "deepin", "description": {"en": "Gentoo Overlay for Deepin Desktop Environment"}, "homepage": "https://github.com/zhtengw/deepin-overlay", "owner": [{"type": "person", "email": "atenzd@gmail.com", "name": "Aten Zhang"}], "source": [{"type": "git", "uri": "git://github.com/zhtengw/deepin-overlay.git"}], "feed": ["https://github.com/zhtengw/deepin-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 00:02:11 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "defiance": {"quality": "experimental", "status": "unofficial", "name": "defiance", "description": {"en": "packages for cloud development"}, "homepage": "https://github.com/d3fy/defiance-overlay.git", "owner": [{"type": "person", "email": "dan@d3fy.net", "name": "Dan Molik"}], "source": [{"type": "git", "uri": "https://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git://github.com/d3fy/defiance-overlay.git"}, {"type": "git", "uri": "git@github.com:d3fy/defiance-overlay.git"}], "feed": ["https://github.com/d3fy/defiance-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 16:20:01 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 73}, "delicious-absurdities": {"quality": "experimental", "status": "unofficial", "name": "delicious-absurdities", "description": {"en": "Personal overlay with delicious absurdities"}, "homepage": "https://github.com/paraenggu/delicious-absurdities-overlay", "owner": [{"type": "person", "email": "c.affolter@purplehaze.ch", "name": "Christian Affolter"}], "source": [{"type": "git", "uri": "https://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git://github.com/paraenggu/delicious-absurdities-overlay.git"}, {"type": "git", "uri": "git@github.com:paraenggu/delicious-absurdities-overlay.git"}], "feed": ["https://github.com/paraenggu/delicious-absurdities-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-03 12:55:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "dequbed": {"quality": "experimental", "status": "unofficial", "name": "dequbed", "description": {"en": "Personal overlay containing mostly small utilities and less stable package versions"}, "homepage": "https://github.com/dequbed/overlay.git", "owner": [{"type": "person", "email": "me@dequbed.space"}], "source": [{"type": "git", "uri": "https://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git://github.com/dequbed/overlay.git"}, {"type": "git", "uri": "git@github.com:dequbed/overlay.git"}], "feed": ["https://github.com/dequbed/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-02 20:23:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dev1990-overlay": {"quality": "experimental", "status": "unofficial", "name": "dev1990-overlay", "description": {"en": "Personal overlay focused on Qt application development and 3d-printing."}, "homepage": "https://github.com/dev-0x7C6/dev1990-overlay.git", "owner": [{"type": "person", "email": "dev.strikeu@gmail.com", "name": "Bartlomiej Burdukiewicz"}], "source": [{"type": "git", "uri": "https://github.com/dev-0x7C6/dev1990-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 23:14:32 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 252}, "dilfridge": {"quality": "experimental", "status": "official", "name": "dilfridge", "description": {"en": "Dilfridge overlay: experimental ebuilds and lab software"}, "homepage": "https://cgit.gentoo.org/dev/dilfridge.git/", "owner": [{"type": "person", "email": "dilfridge@gentoo.org", "name": "Andreas K. Huettel (dilfridge)"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/dilfridge.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/dilfridge.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/dilfridge.git"}], "feed": ["https://cgit.gentoo.org/dev/dilfridge.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:01:25 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "displacer": {"quality": "experimental", "status": "unofficial", "name": "displacer", "description": {"en": "Fixes and new unstable packages"}, "homepage": "https://cgit.gentoo.org/user/displacer.git/", "owner": [{"type": "person", "email": "disinbox@gmail.com", "name": "Igor Ulyanov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/displacer.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/displacer.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/displacer.git"}], "feed": ["https://cgit.gentoo.org/user/displacer.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-11-01 16:16:15 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "distros": {"quality": "experimental", "status": "unofficial", "name": "distros", "description": {"en": "Calculate Linux Profiles"}, "homepage": "http://www.calculate-linux.org", "owner": [{"type": "person", "email": "at@calculate.ru"}], "source": [{"type": "git", "uri": "git://git.calculate-linux.org/calculate/distros-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 09:08:24 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 0}, "djc": {"quality": "experimental", "status": "unofficial", "name": "djc", "description": {"en": "Personal overlay; testing and early development"}, "homepage": "https://github.com/djc/djc-overlay", "owner": [{"type": "person", "email": "djc@gentoo.org", "name": "Dirkjan Ochtman"}], "source": [{"type": "git", "uri": "https://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git://github.com/djc/djc-overlay.git"}, {"type": "git", "uri": "git@github.com:djc/djc-overlay.git"}], "feed": ["https://github.com/djc/djc-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:21:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "dlang": {"quality": "experimental", "status": "unofficial", "name": "dlang", "description": {"en": "A collection of ebuilds related to the D programming\n language."}, "homepage": "https://github.com/gentoo/dlang", "owner": [{"type": "person", "email": "Marco.Leise@gmx.de"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dlang.git"}, {"type": "git", "uri": "git@github.com:gentoo/dlang.git"}, {"type": "git", "uri": "git://github.com/gentoo/dlang.git"}], "feed": ["https://github.com/gentoo/dlang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 18:17:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 84}, "dm9pZCAq": {"quality": "experimental", "status": "unofficial", "name": "dm9pZCAq", "description": {"en": "personal overlay with different packages, mainly with packages with KISS mindset"}, "homepage": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay", "owner": [{"type": "person", "email": "v@0x0c.xyz", "name": "dm9pZCAq"}], "source": [{"type": "git", "uri": "https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:19:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "dmchurch": {"quality": "experimental", "status": "unofficial", "name": "dmchurch", "description": {"en": "Danielle Church's Portage overlay"}, "homepage": "https://github.com/dmchurch/portage-overlay", "owner": [{"type": "person", "email": "dani.church@gmail.com", "name": "Danielle Church"}], "source": [{"type": "git", "uri": "https://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/dmchurch/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:dmchurch/portage-overlay.git"}], "feed": ["https://github.com/dmchurch/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-25 12:30:43 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "dotnet": {"quality": "experimental", "status": "official", "name": "dotnet", "description": {"en": "Experimental overlay for .NET packages."}, "homepage": "https://github.com/gentoo/dotnet", "owner": [{"type": "project", "email": "dotnet@gentoo.org", "name": "Dotnet team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/dotnet.git"}, {"type": "git", "uri": "git@github.com:gentoo/dotnet.git"}], "feed": ["https://github.com/gentoo/dotnet/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 12:49:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 168}, "drdim": {"quality": "experimental", "status": "unofficial", "name": "drdim", "description": {"en": "Gentoo Layman portage repository for Jetbrains Products"}, "homepage": "https://github.com/drdim/layman", "owner": [{"type": "person", "email": "dr.dim.pro@gmail.com", "name": "Dmitriy Bogatkin"}], "source": [{"type": "git", "uri": "https://github.com/drdim/layman.git"}, {"type": "git", "uri": "git://github.com/drdim/layman.git"}, {"type": "git", "uri": "git@github.com:drdim/layman.git"}], "feed": ["https://github.com/drdim/layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-14 05:51:00 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "dwfreed": {"quality": "experimental", "status": "unofficial", "name": "dwfreed", "description": {"en": "My random Gentoo packages"}, "homepage": "https://bitbucket.org/dwfreed/dwfreed.gentoo/", "owner": [{"type": "person", "email": "dwfreed@mtu.edu", "name": "Douglas Freed"}], "source": [{"type": "git", "uri": "https://bitbucket.org/dwfreed/dwfreed.gentoo"}], "feed": ["https://bitbucket.org/dwfreed/dwfreed.gentoo/rss"], "x-state": "GOOD", "x-timestamp": "2017-04-09 01:17:09 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "dwosky": {"quality": "experimental", "status": "unofficial", "name": "dwosky", "description": {"en": "Dwosky's personal overlay"}, "homepage": "https://github.com/Dwosky/Dwosky-overlay", "owner": [{"type": "person", "email": "dwosky@pm.me", "name": "Pedro Arizmendi"}], "source": [{"type": "git", "uri": "https://github.com/Dwosky/Dwosky-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Dwosky/Dwosky-overlay.git"}], "feed": ["https://github.com/Dwosky/Dwosky-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 10:31:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "earshark": {"quality": "experimental", "status": "unofficial", "name": "earshark", "description": {"en": "personal overlay, mostly games related"}, "homepage": "https://github.com/Chemrat/overlay", "owner": [{"type": "person", "email": "jazzvoid@gmail.com", "name": "Valeriy"}], "source": [{"type": "git", "uri": "https://github.com/Chemrat/overlay.git"}, {"type": "git", "uri": "git://github.com/Chemrat/overlay.git"}], "feed": ["https://github.com/Chemrat/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 00:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "eclipse": {"quality": "experimental", "status": "official", "name": "eclipse", "description": {"en": "Community effort at packaging Eclipse Java SDK"}, "homepage": "https://github.com/gentoo/eclipse-overlay", "owner": [{"type": "project", "email": "eclipse@gentoo.org", "name": "Eclipse team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git://github.com/gentoo/eclipse-overlay.git"}, {"type": "git", "uri": "git@github.com:gentoo/eclipse-overlay.git"}], "feed": ["https://github.com/gentoo/eclipse-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-06-24 14:34:45 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "edgets": {"quality": "experimental", "status": "unofficial", "name": "edgets", "description": {"en": "Gentoo overlay that brings you the newest versions of modern software."}, "homepage": "https://github.com/BlueManCZ/edgets", "owner": [{"type": "person", "email": "ivo97@centrum.cz", "name": "Ivo \u0160merek"}], "source": [{"type": "git", "uri": "https://github.com/BlueManCZ/edgets.git"}, {"type": "git", "uri": "git+ssh://git@github.com/BlueManCZ/edgets.git"}], "feed": ["https://github.com/BlueManCZ/edgets/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 08:17:17 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "eigenlay": {"quality": "experimental", "status": "unofficial", "name": "eigenlay", "description": {"en": "Eigenlab Gentoo overlay"}, "homepage": "https://gitlab.com/eigennet/eigenlay", "owner": [{"type": "person", "email": "gio@eigenlab.org", "name": "Gioacchino Mazzurco"}], "source": [{"type": "git", "uri": "https://gitlab.com/eigennet/eigenlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-04-01 16:18:39 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "einflay": {"quality": "experimental", "status": "unofficial", "name": "einflay", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/EinstokFair/einflay", "owner": [{"type": "person", "email": "einfair@zoho.eu", "name": "Einstok Fair"}], "source": [{"type": "git", "uri": "https://github.com/EinstokFair/einflay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/EinstokFair/einflay.git"}], "feed": ["https://github.com/EinstokFair/einflay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 19:16:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "ejabberd": {"quality": "experimental", "status": "unofficial", "name": "ejabberd", "description": {"en": "Fresh ejabberd versions and dependencies"}, "homepage": "https://github.com/rion-overlay/ejabberd-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/ejabberd-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/ejabberd-overlay.git"}], "feed": ["https://github.com/rion-overlay/ejabberd-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-04-30 13:18:01 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "electron": {"quality": "experimental", "status": "unofficial", "name": "electron", "description": {"en": "Electron Overlay"}, "homepage": "https://github.com/elprans/electron-overlay", "owner": [{"type": "person", "email": "elvis@magic.io", "name": "Elvis Pranskevichus"}], "source": [{"type": "git", "uri": "https://github.com/elprans/electron-overlay.git"}], "feed": ["https://github.com/elprans/electron-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-08 14:02:03 -0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "elementary": {"quality": "experimental", "status": "unofficial", "name": "elementary", "description": {"en": "The elementary OS experience for Gentoo Linux. "}, "homepage": "https://github.com/pimvullers/elementary", "owner": [{"type": "person", "email": "gentoo.org@vullersmail.nl", "name": "Pim Vullers"}], "source": [{"type": "git", "uri": "https://github.com/pimvullers/elementary.git"}, {"type": "git", "uri": "git://github.com/pimvullers/elementary.git"}], "feed": ["https://github.com/pimvullers/elementary/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-28 21:04:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 118}, "elopez-r-overlay": {"quality": "experimental", "status": "unofficial", "name": "elopez-r-overlay", "description": {"en": "My Gentoo overlay for Ebuilds"}, "homepage": "https://gitlab.com/libre_hackerman/elopez-r-overlay", "owner": [{"type": "person", "email": "gnu_stallman@protonmail.ch", "name": "Esteban L\u00f3pez Rodr\u00edguez"}], "source": [{"type": "git", "uri": "https://gitlab.com/libre_hackerman/elopez-r-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:libre_hackerman/elopez-r-overlay.git"}], "feed": ["https://gitlab.com/libre_hackerman/elopez-r-overlay/-/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-18 00:43:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "emacs": {"quality": "experimental", "status": "official", "name": "emacs", "description": {"en": "Provide Emacs and XEmacs related ebuilds which are\n experimental or work-in-progress. Don't rely on them, but don't\n hesitate to file bugs or write emails."}, "homepage": "https://wiki.gentoo.org/wiki/Project:Emacs/Overlay", "owner": [{"type": "project", "email": "emacs@gentoo.org", "name": "Gentoo Emacs team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/emacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/emacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/emacs.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/emacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-22 10:07:44 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "enlightenment-live": {"quality": "experimental", "status": "unofficial", "name": "enlightenment-live", "description": {"en": "Enlightenment WM latest stable version and live ebuilds"}, "homepage": "https://github.com/rafspiny/enlightenment-live", "owner": [{"type": "person", "email": "rafspiny@gmail.com", "name": "Raffaele Spinelli"}], "source": [{"type": "git", "uri": "https://github.com/rafspiny/enlightenment-live.git"}], "feed": ["https://github.com/rafspiny/enlightenment-live/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:34:34 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "ennui": {"quality": "experimental", "status": "unofficial", "name": "ennui", "description": {"en": "Facilitate running hardened-desktop hybrid system"}, "homepage": "https://gitweb.gentoo.org/user/ennui.git/", "owner": [{"type": "person", "email": "gentoo@seaofdirac.net", "name": "Nicholas Fish"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/ennui.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/ennui.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/ennui.git"}], "feed": ["https://gitweb.gentoo.org/user/ennui.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 23:15:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "equaeghe": {"quality": "experimental", "status": "unofficial", "name": "equaeghe", "description": {"en": "Erik Quaeghebeur's personal Gentoo overlay"}, "homepage": "https://github.com/equaeghe/gentoo-overlay/", "owner": [{"type": "person", "email": "gentoo@e3q.eu", "name": "Erik Quaeghebeur"}], "source": [{"type": "git", "uri": "https://github.com/equaeghe/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/equaeghe/gentoo-overlay.git"}], "feed": ["https://github.com/equaeghe/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 13:12:56 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "erayd": {"quality": "experimental", "status": "unofficial", "name": "erayd", "description": {"en": "Various personal ebuilds"}, "homepage": "https://github.com/erayd/overlay", "owner": [{"type": "person", "email": "steve@erayd.net", "name": "Steve Gilberd"}], "source": [{"type": "git", "uri": "https://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git://github.com/erayd/overlay.git"}, {"type": "git", "uri": "git@github.com:erayd/overlay.git"}], "feed": ["https://github.com/erayd/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-20 17:20:54 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "escpr2": {"quality": "experimental", "status": "unofficial", "name": "escpr2", "description": {"en": "EPSON ESCPR2 inkjet printer repository"}, "homepage": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2", "owner": [{"type": "person", "email": "andreas.thalhammer@linux.com", "name": "Andreas Thalhammer"}], "source": [{"type": "git", "uri": "https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2.git"}], "feed": ["https://gitlab.com/at.gentoo.repo/epson-inkjet-printer-escpr2/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 07:38:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "ethereum": {"quality": "experimental", "status": "unofficial", "name": "ethereum", "description": {"en": "The Ethereum blockchain-based distributed computing platform"}, "homepage": "https://github.com/coolparadox/ethereum-gentoo-overlay", "owner": [{"type": "person", "email": "coolparadox@gmail.com", "name": "Rafael Lorandi"}], "source": [{"type": "git", "uri": "https://github.com/coolparadox/ethereum-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:coolparadox/ethereum-gentoo-overlay.git"}], "feed": ["https://github.com/coolparadox/ethereum-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-07 16:42:19 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "eugene-bright": {"quality": "experimental", "status": "unofficial", "name": "eugene-bright", "description": {"en": "The personal overlay of Eugene Bright"}, "homepage": "https://github.com/eugene-bright/eugene-bright-overlay", "owner": [{"type": "person", "email": "eugene@bright.gdn", "name": "Eugene Bright"}], "source": [{"type": "git", "uri": "https://github.com/eugene-bright/eugene-bright-overlay.git"}, {"type": "git", "uri": "git@github.com:eugene-bright/eugene-bright-overlay.git"}], "feed": ["https://github.com/eugene-bright/eugene-bright-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-18 15:35:56 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "ext-devlibs": {"quality": "experimental", "status": "unofficial", "name": "ext-devlibs", "description": {"en": "Mostly c/c++ and python libraries"}, "homepage": "https://gitlab.com/extsidvind/ext-devlibs", "owner": [{"type": "person", "email": "ext@sidvind.com", "name": "David Sveningsson"}], "source": [{"type": "git", "uri": "https://gitlab.com/extsidvind/ext-devlibs.git"}, {"type": "git", "uri": "git@gitlab.com:extsidvind/ext-devlibs.git"}], "feed": ["https://gitlab.com/extsidvind/ext-devlibs/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 00:06:10 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "farmboy0": {"quality": "experimental", "status": "unofficial", "name": "farmboy0", "description": {"en": "Personal overlay of Enrico Horn"}, "homepage": "https://github.com/farmboy0/portage-overlay", "owner": [{"type": "person", "email": "farmboy0@googlemail.com", "name": "Enrico Horn"}], "source": [{"type": "git", "uri": "https://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git://github.com/farmboy0/portage-overlay.git"}, {"type": "git", "uri": "git@github.com:farmboy0/portage-overlay.git"}], "feed": ["https://github.com/farmboy0/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 21:32:30 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "fem-overlay": {"quality": "experimental", "status": "unofficial", "name": "fem-overlay", "description": {"en": "FeM Gentoo Overlay"}, "homepage": "https://bitbucket.fem.tu-ilmenau.de/projects/GENTOO/repos/fem-overlay/", "owner": [{"type": "person", "email": "frainz@mailbox.org", "name": "Paul Michel"}], "source": [{"type": "git", "uri": "https://bitbucket.fem.tu-ilmenau.de/scm/gentoo/fem-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 19:03:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 123}, "ferki": {"quality": "experimental", "status": "unofficial", "name": "ferki", "description": {"en": "Ebuilds used and/or proxy maintained by FErki"}, "homepage": "https://github.com/ferki/gentoo-overlay", "owner": [{"type": "person", "email": "erkiferenc@gmail.com", "name": "Ferenc Erki"}], "source": [{"type": "git", "uri": "https://github.com/ferki/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ferki/gentoo-overlay.git"}], "feed": ["https://github.com/ferki/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 21:19:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "fidonet": {"quality": "experimental", "status": "unofficial", "name": "fidonet", "description": {"en": "Overlay of Benny Pedersen"}, "owner": [{"type": "person", "email": "me@junc.org", "name": "Benny Pedersen"}], "source": [{"type": "rsync", "uri": "rsync://fidonet.overlay.junc.org/fidonet/"}], "x-state": "GOOD", "x-timestamp": "2020-11-21 13:15:46.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flammie": {"quality": "experimental", "status": "unofficial", "name": "flammie", "description": {"en": "An overlay for gentoo for things Flammie's worked on: Apertium, HFST, computational linguistics, spell-checking, obscure languages..."}, "homepage": "https://github.com/flammie/flammie-overlay", "owner": [{"type": "person", "email": "flammie@gentoo.org", "name": "Flammie Pirinen"}], "source": [{"type": "git", "uri": "https://github.com/flammie/flammie-overlay.git"}, {"type": "git", "uri": "git://github.com/flammie/flammie-overlay.git"}], "feed": ["https://github.com/flammie/flammie-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-26 14:35:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "flavour": {"quality": "experimental", "status": "unofficial", "name": "flavour", "description": {"en": "Personal overlay of Wim Muskee"}, "homepage": "https://github.com/wimmuskee/flavour", "owner": [{"type": "person", "email": "wimmuskee@gmail.com", "name": "Wim Muskee"}], "source": [{"type": "git", "uri": "https://github.com/wimmuskee/flavour.git"}, {"type": "git", "uri": "git://github.com/wimmuskee/flavour.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 10:13:46 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "flewkey-overlay": {"quality": "experimental", "status": "unofficial", "name": "flewkey-overlay", "description": {"en": "Personal Gentoo overlay for flewkey"}, "homepage": "https://git.sdf.org/flewkey/flewkey-overlay", "owner": [{"type": "person", "email": "flewkey@2a03.party", "name": "Ryan Fox"}], "source": [{"type": "git", "uri": "https://git.sdf.org/flewkey/flewkey-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 19:52:53 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "flightsim": {"quality": "experimental", "status": "unofficial", "name": "flightsim", "description": {"en": "Overlay with packages for flight simulation, mainly related to X-Plane"}, "homepage": "https://github.com/rafaelmartins/flightsim-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/flightsim-overlay.git"}, {"type": "git", "uri": "git@github.com:rafaelmartins/flightsim-overlay.git"}], "feed": ["https://github.com/rafaelmartins/flightsim-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-05-07 01:00:51 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "floppym": {"quality": "experimental", "status": "unofficial", "name": "floppym", "description": {"en": "floppym's personal overlay"}, "homepage": "https://github.com/floppym/floppym", "owner": [{"type": "person", "email": "floppym@gentoo.org", "name": "Mike Gilbert"}], "source": [{"type": "git", "uri": "https://github.com/floppym/floppym"}], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:41:02 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "flow": {"quality": "experimental", "status": "unofficial", "name": "flow", "description": {"en": "Ebuilds by Florian Schmaus"}, "homepage": "https://gitlab.com/Flow/flow-s-ebuilds", "owner": [{"type": "person", "email": "flo@geekplace.eu", "name": "Florian Schmaus"}], "source": [{"type": "git", "uri": "https://gitlab.com/Flow/flow-s-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:05:56 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 102}, "flussence": {"quality": "experimental", "status": "unofficial", "name": "flussence", "description": {"en": "Ant P.'s personal overlay"}, "homepage": "https://repo.or.cz/flussence-overlay.git", "owner": [{"type": "person", "email": "ant+gentoo.bugs@flussence.eu", "name": "Anthony Parsons"}], "source": [{"type": "git", "uri": "https://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "git://repo.or.cz/flussence-overlay.git"}, {"type": "git", "uri": "ssh://git@repo.or.cz/flussence-overlay.git"}], "feed": ["https://repo.or.cz/flussence-overlay.git/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 05:58:14 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "fol4": {"quality": "experimental", "status": "unofficial", "name": "fol4", "description": {"en": "fol4 overlay"}, "homepage": "https://gitlab.com/madsl/fol4", "owner": [{"type": "person", "email": "mads@ab3.no", "name": "Mads"}], "source": [{"type": "git", "uri": "https://gitlab.com/madsl/fol4"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/madsl/fol4.git"}], "feed": ["https://gitlab.com/madsl/fol4/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-25 11:38:33 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "foo-overlay": {"quality": "experimental", "status": "unofficial", "name": "foo-overlay", "description": {"en": "Piotr's fixes and new packages"}, "homepage": "https://github.com/slashbeast/foo-overlay", "owner": [{"type": "person", "email": "slashbeast@gentoo.org", "name": "Piotr Karbowski"}], "source": [{"type": "git", "uri": "git://github.com/slashbeast/foo-overlay.git"}, {"type": "git", "uri": "https://github.com/slashbeast/foo-overlay.git"}], "feed": ["https://github.com/slashbeast/foo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-01-19 16:39:22 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "fordfrog": {"quality": "experimental", "status": "official", "name": "fordfrog", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/fordfrog.git/", "owner": [{"type": "person", "email": "fordfrog@gentoo.org", "name": "Miroslav \u0160ulc"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/fordfrog.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/fordfrog.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/fordfrog.git"}], "feed": ["https://cgit.gentoo.org/dev/fordfrog.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-14 09:45:31 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 286}, "fowlay": {"quality": "experimental", "status": "unofficial", "name": "fowlay", "description": {"en": "Collection of ebuilds"}, "homepage": "https://github.com/fowlay/fowlay-overlay", "owner": [{"type": "person", "email": "rabbe@bahnhof.se", "name": "Rabbe Fogelholm"}], "source": [{"type": "git", "uri": "https://github.com/fowlay/fowlay-overlay.git"}], "feed": ["https://github.com/fowlay/fowlay-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-04-07 14:41:09 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "foxiverlay": {"quality": "experimental", "status": "unofficial", "name": "foxiverlay", "description": {"en": "Personal overlay for unofficial ebuilds"}, "homepage": "https://github.com/Pekkari/foxiverlay", "owner": [{"type": "person", "email": "koalinux@gmail.com", "name": "Jos\u00e9 Pekkarinen"}], "source": [{"type": "git", "uri": "https://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git://github.com/Pekkari/foxiverlay.git"}, {"type": "git", "uri": "git@github.com:Pekkari/foxiverlay.git"}], "feed": ["https://github.com/Pekkari/foxiverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 16:19:16 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "fritteli": {"quality": "experimental", "status": "unofficial", "name": "fritteli", "description": {"en": "fritteli's Gentoo Overlay"}, "homepage": "https://github.com/fritteli/gentoo-overlay", "owner": [{"type": "person", "email": "manuel@fritteli.ch", "name": "Manuel Friedli"}], "source": [{"type": "git", "uri": "https://github.com/fritteli/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/fritteli/gentoo-overlay.git"}], "feed": ["https://github.com/fritteli/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 23:07:14 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 45}, "frr-gentoo": {"quality": "stable", "status": "official", "name": "frr-gentoo", "description": {"en": "Free Range Routing Gentoo Overlay"}, "homepage": "https://frrouting.org/", "owner": [{"type": "person", "email": "f0o@devilcode.org", "name": "Daniel 'f0o' Preussker"}], "source": [{"type": "git", "uri": "https://github.com/FRRouting/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:FRRouting/gentoo-overlay.git"}], "feed": ["https://github.com/FRRouting/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-01 08:18:20 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "fusion809": {"quality": "experimental", "status": "unofficial", "name": "fusion809", "description": {"en": "Brenton's Portage overlay"}, "homepage": "https://github.com/fusion809/fusion809-overlay", "owner": [{"type": "person", "email": "brentonhorne77@gmail.com", "name": "Brenton Horne"}], "source": [{"type": "git", "uri": "https://github.com/fusion809/fusion809-overlay.git"}, {"type": "git", "uri": "git://github.com/fusion809/fusion809-overlay.git"}], "feed": ["https://github.com/fusion809/fusion809-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-31 08:32:58 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "fuverlay": {"quality": "experimental", "status": "unofficial", "name": "fuverlay", "description": {"en": "Funkill's overlay"}, "homepage": "https://github.com/funkill/fuverlay", "owner": [{"type": "person", "email": "funkill2@gmail.com", "name": "Funkill"}], "source": [{"type": "git", "uri": "https://github.com/funkill/fuverlay.git"}], "feed": ["https://github.com/funkill/fuverlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-03 01:49:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "gamarouns": {"quality": "experimental", "status": "unofficial", "name": "gamarouns", "description": {"en": "Bits and pieces missing in gentoo or layman repos I need"}, "homepage": "https://github.com/Amaroun/gamarouns", "owner": [{"type": "person", "email": "vit.kasal@gmail.com", "name": "amaroun"}], "source": [{"type": "git", "uri": "https://github.com/Amaroun/gamarouns.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 16:53:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "gamerlay": {"quality": "experimental", "status": "unofficial", "name": "gamerlay", "description": {"en": "\n Gamers overlay for all various games. Not related with games team.\n "}, "homepage": "https://cgit.gentoo.org/proj/gamerlay.git", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gamerlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gamerlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gamerlay.git"}], "feed": ["https://cgit.gentoo.org/proj/gamerlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:32:19 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 103}, "gcarq": {"quality": "experimental", "status": "unofficial", "name": "gcarq", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/gcarq/gcarq-overlay", "owner": [{"type": "person", "email": "michael.egger@tsn.at", "name": "Michael Egger"}], "source": [{"type": "git", "uri": "https://github.com/gcarq/gcarq-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gcarq/gcarq-overlay.git"}], "feed": ["https://github.com/gcarq/gcarq-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 18:54:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "genthree": {"quality": "experimental", "status": "unofficial", "name": "genthree", "description": {"en": "Gentoo overlay from the genthree project"}, "homepage": "https://genthree.io/overlay", "owner": [{"type": "person", "email": "nyronium@genthree.io", "name": "nyronium"}], "source": [{"type": "git", "uri": "https://gitlab.com/genthree/overlay.git"}], "feed": ["https://gitlab.com/genthree/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-18 16:27:50 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "gentoo": {"quality": "core", "status": "official", "name": "gentoo", "description": {"en": "Official Gentoo ebuild repository"}, "homepage": "https://gentoo.org/", "owner": [{"type": "project", "email": "bug-wranglers@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.org/gentoo-portage"}, {"type": "git", "uri": "https://anongit.gentoo.org/git/repo/gentoo.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/gentoo.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/gentoo.git"}], "feed": ["https://cgit.gentoo.org/repo/gentoo.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:06:43 +0200\n", "x-openpgp-signed": "U", "x-masters": [], "x-ebuild-count": 29148}, "gentoo-bootstrap": {"quality": "experimental", "status": "unofficial", "name": "gentoo-bootstrap", "description": {"en": "Overlay providing packages to bootstrap OpenJDK and Rust"}, "homepage": "https://gitlab.com/stikonas/gentoo-bootstrap", "owner": [{"type": "person", "email": "andrius@stikonas.eu", "name": "Andrius \u0160tikonas"}], "source": [{"type": "git", "uri": "https://gitlab.com/stikonas/gentoo-bootstrap.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git"}], "x-state": "GOOD", "x-timestamp": "2020-11-13 21:17:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "gentoo-clang": {"quality": "experimental", "status": "unofficial", "name": "gentoo-clang", "description": {"en": "Gentoo overlay providing patches to build entire system with clang"}, "homepage": "https://github.com/BilyakA/gentoo-clang", "owner": [{"type": "person", "email": "bilyak.alexander@gmail.com", "name": "Alexander Bilyak"}], "source": [{"type": "git", "uri": "https://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git://github.com/BilyakA/gentoo-clang.git"}, {"type": "git", "uri": "git@github.com:BilyakA/gentoo-clang.git"}], "feed": ["https://github.com/BilyakA/gentoo-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-29 09:13:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "gentoo-mate": {"quality": "experimental", "status": "official", "name": "gentoo-mate", "description": {"en": "Gentoo MATE Desktop Project Repo"}, "homepage": "https://wiki.gentoo.org/wiki/Project:MATE", "owner": [{"type": "project", "email": "mate@gentoo.org", "name": "MATE Desktop Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gentoo-mate.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gentoo-mate.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gentoo-mate.git"}], "feed": ["https://cgit.gentoo.org/proj/gentoo-mate.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-07 22:21:22 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 173}, "gentoo-zh": {"quality": "experimental", "status": "unofficial", "name": "gentoo-zh", "description": {"en": "To provide programs useful to Chinese speaking users (merged\n from gentoo-china and gentoo-taiwan)."}, "homepage": "https://github.com/microcai/gentoo-zh", "owner": [{"type": "person", "email": "microcai@fedoraproject.org"}], "source": [{"type": "git", "uri": "git://github.com/microcai/gentoo-zh.git"}], "feed": ["https://github.com/microcai/gentoo-zh/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 15:34:37 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 234}, "gentoobr": {"quality": "experimental", "status": "unofficial", "name": "gentoobr", "description": {"en": "Overlay containing experimental packages developed\n by the brazilian community, with focus on providing programs useful to\n portuguese speaking users and introducing new people to contribute.", "pt": "Overlay contendo pacotes experimentais desenvolvidos\n pela comunidade brasileira, com foco em oferecer programas \u00fateis \u00e0 falantes\n da l\u00edngua portuguesa e em introduzir novas pessoas a contribuir."}, "homepage": "https://github.com/gentoobr/overlay", "owner": [{"type": "person", "email": "leonardohn@null.net", "name": "Leonardo Henrique Neumann"}], "source": [{"type": "git", "uri": "https://github.com/gentoobr/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoobr/overlay.git"}], "feed": ["https://github.com/gentoobr/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 04:13:19 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "gerislay": {"quality": "experimental", "status": "unofficial", "name": "gerislay", "description": {"en": "A personal overlay with no specific focus (mainly to\n test ebuilds). Highly experimental. It is meant as a playground for me,\n but others might be interested."}, "homepage": "https://cgit.gentoo.org/repo/user/gerislay.git", "owner": [{"type": "person", "email": "gerion.entrup@flump.de", "name": "gerion"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/gerislay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/gerislay.git"}], "feed": ["https://cgit.gentoo.org/repo/user/gerislay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:52:03 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "gig": {"quality": "experimental", "status": "unofficial", "name": "gig", "description": {"en": "Gig OS's Overlay"}, "homepage": "https://github.com/Gig-OS/gig", "owner": [{"type": "person", "email": "yangmame@i2pmail.org"}], "source": [{"type": "git", "uri": "https://github.com/Gig-OS/gig.git"}], "feed": ["https://github.com/Gig-OS/gig/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-06 15:11:38 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "gitlab": {"quality": "experimental", "status": "unofficial", "name": "gitlab", "description": {"en": "Unofficial ebuilds for Gitlab"}, "homepage": "https://gitlab.awesome-it.de/overlays/gitlab", "owner": [{"type": "person", "email": "prote@fmi.uni-stuttgart.de", "name": "Horst Prote"}], "source": [{"type": "git", "uri": "https://gitlab.awesome-it.de/overlays/gitlab.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-18 16:32:01 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 68}, "glarbs-overlay": {"quality": "experimental", "status": "unofficial", "name": "glarbs-overlay", "description": {"en": "A Gentoo overlay used by GLARBS.", "sv": "Ett Gentoo \u00f6verl\u00e4gg som anv\u00e4nds av GLARBS."}, "homepage": "https://wiki.gentoo.org/wiki/User:Et-8/GLARBS", "owner": [{"type": "person", "email": "et-8@emiliatrollros.se", "name": "Emilia Trollros"}], "source": [{"type": "git", "uri": "https://gitlab.com/et-8/glarbs-overlay.git"}], "feed": ["https://gitlab.com/et-8/glarbs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-22 19:46:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "gnome": {"quality": "experimental", "status": "official", "name": "gnome", "description": {"en": "experimental gnome ebuilds"}, "homepage": "https://cgit.gentoo.org/proj/gnome.git/", "owner": [{"type": "project", "email": "gnome@gentoo.org", "name": "GNOME team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnome.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnome.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnome.git"}], "feed": ["https://cgit.gentoo.org/proj/gnome.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-23 21:50:20 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 110}, "gnome-next": {"quality": "experimental", "status": "unofficial", "name": "gnome-next", "description": {"en": "experimental newer gnome ebuilds"}, "homepage": "https://github.com/Heather/gentoo-gnome", "owner": [{"type": "person", "email": "cynede@gentoo.org", "name": "Mikhail Pukhlikov"}], "source": [{"type": "git", "uri": "https://github.com/Heather/gentoo-gnome.git"}, {"type": "git", "uri": "git@github.com:Heather/gentoo-gnome.git"}], "feed": ["https://github.com/Heather/gentoo-gnome/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-04 10:43:15 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 191}, "gnuradio": {"quality": "experimental", "status": "unofficial", "name": "gnuradio", "description": {"en": "A repository for GNURadio packages/addons"}, "homepage": "https://github.com/hololeap/gentoo-gnuradio", "owner": [{"type": "person", "email": "hololeap@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/hololeap/gentoo-gnuradio"}], "feed": ["https://github.com/hololeap/gentoo-gnuradio/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-15 20:24:11 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 128}, "gnustep": {"quality": "experimental", "status": "official", "name": "gnustep", "description": {"en": "Experimental ebuilds for GNUstep packages in Gentoo. Comments and bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/gnustep.git/", "owner": [{"type": "project", "email": "gnustep@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/gnustep.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/gnustep.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/gnustep.git"}], "feed": ["https://cgit.gentoo.org/proj/gnustep.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-01-14 17:11:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "gnux32": {"quality": "experimental", "status": "unofficial", "name": "gnux32", "description": {"en": "A personal overlay with ebuilds for the x32 ABI"}, "homepage": "https://github.com/1camper/gnux32", "owner": [{"type": "person", "email": "theonetruecamper@gmx.de", "name": "Matthias R\u00e4ncker"}], "source": [{"type": "git", "uri": "https://github.com/1camper/gnux32.git"}, {"type": "git", "uri": "git://github.com/1camper/gnux32.git"}], "feed": ["https://github.com/1camper/gnux32/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-05-24 11:36:38 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 82}, "go-overlay": {"quality": "experimental", "status": "unofficial", "name": "go-overlay", "description": {"en": "Golang related ebuilds"}, "homepage": "https://github.com/Dr-Terrible/go-overlay", "owner": [{"type": "person", "email": "toffanin.mauro@gmail.com", "name": "Mauro Toffanin"}], "source": [{"type": "git", "uri": "https://github.com/Dr-Terrible/go-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-01-27 21:38:55 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 241}, "godin": {"quality": "experimental", "status": "unofficial", "name": "godin", "description": {"en": "Godin's Gentoo Overlay"}, "homepage": "https://github.com/Godin/gentoo-overlay", "owner": [{"type": "person", "email": "mandrikov@gmail.com", "name": "Evgeny Mandrikov"}], "source": [{"type": "git", "uri": "https://github.com/Godin/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/Godin/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-20 12:08:54 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "goduck777": {"quality": "experimental", "status": "unofficial", "name": "goduck777", "description": {"en": "Personal overlay containing some not-so-popular apps"}, "homepage": "https://github.com/goduck777/gentoo-overlay", "owner": [{"type": "person", "email": "goduck777@gmail.com", "name": "Chang Liu"}], "source": [{"type": "git", "uri": "https://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/goduck777/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:goduck777/gentoo-overlay.git"}], "feed": ["https://github.com/Godin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:07:27 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "goris": {"quality": "experimental", "status": "unofficial", "name": "goris", "description": {"en": "Goris overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/goris.git/", "owner": [{"type": "person", "email": "norayr.am@gmail.com", "name": "Norayr Mirakyan"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/goris.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/goris.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/goris.git"}], "feed": ["https://cgit.gentoo.org/repo/user/goris.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-16 19:37:55 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "graaff": {"quality": "experimental", "status": "official", "name": "graaff", "description": {"en": "Developer overlay of Hans de Graaff with mostly ruby and\n xemacs ebuilds, and a few assorted other goodies."}, "homepage": "http://moving-innovations.com/blog/", "owner": [{"type": "person", "email": "graaff@gentoo.org", "name": "Hans de Graaff"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/graaff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/graaff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/graaff.git"}], "feed": ["https://cgit.gentoo.org/dev/graaff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-29 07:47:26 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 422}, "griffon_overlay": {"quality": "experimental", "status": "unofficial", "name": "griffon_overlay", "description": {"en": "Personal overlay of GriffOn Yi"}, "homepage": "https://github.com/windfail/griffon_overlay", "owner": [{"type": "person", "email": "yily_101@163.com", "name": "GriffOn Yi"}], "source": [{"type": "git", "uri": "https://github.com/windfail/griffon_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/windfail/griffon_overlay.git"}], "feed": ["https://github.com/windfail/griffon_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:29:59 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "grub2-themes": {"quality": "experimental", "status": "official", "name": "grub2-themes", "description": {"en": "Overlay dedicated to Grub2 themes (of any distribution)"}, "homepage": "https://gitweb.gentoo.org/repo/proj/grub2-themes.git/", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/grub2-themes.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git"}], "feed": ["https://gitweb.gentoo.org/repo/proj/grub2-themes.git/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2015-07-19 17:38:24 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "gsview-overlay": {"quality": "experimental", "status": "unofficial", "name": "gsview-overlay", "description": {"en": "Overlay for the gsview and some other plotting/scientific soft"}, "homepage": "https://github.com/uleysky/gsview-overlay", "owner": [{"type": "person", "email": "uleysky@gmail.com", "name": "Michael Uleysky"}], "source": [{"type": "git", "uri": "https://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git://github.com/uleysky/gsview-overlay.git"}, {"type": "git", "uri": "git@github.com:uleysky/gsview-overlay.git"}], "feed": ["https://github.com/uleysky/gsview-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-21 12:19:15 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "guru": {"quality": "experimental", "status": "official", "name": "guru", "description": {"en": "GURU: Ebuild repository entirely maintained by Gentoo users"}, "homepage": "https://wiki.gentoo.org/wiki/Project:GURU", "owner": [{"type": "project", "email": "guru@gentoo.org", "name": "GURU"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/guru.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/guru.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/guru.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-30 21:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 956}, "haarp": {"quality": "experimental", "status": "unofficial", "name": "haarp", "description": {"en": "misc ebuilds that aren't in the main tree"}, "homepage": "https://cgit.gentoo.org/user/haarp.git/", "owner": [{"type": "person", "email": "main.haarp@gmail.com", "name": "haarp"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/haarp.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-24 22:31:40 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 44}, "hamper-overlay": {"quality": "experimental", "status": "unofficial", "name": "hamper-overlay", "description": {"en": "User overlay"}, "homepage": "https://github.com/hamper/hamper-overlay", "owner": [{"type": "person", "email": "hamper.nhs@gmail.com", "name": "Alexander Pilipenko"}], "source": [{"type": "git", "uri": "https://github.com/Hamper/hamper-overlay.git"}, {"type": "git", "uri": "git://github.com/hamper/hamper-overlay.git"}], "feed": ["https://github.com/hamper/hamper-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 18:47:46 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "han": {"quality": "experimental", "status": "unofficial", "name": "han", "description": {"en": "Han's personal ebuild repository"}, "homepage": "https://github.com/hanmertens/han-overlay", "owner": [{"type": "person", "email": "hanmertens@outlook.com", "name": "Han Mertens"}], "source": [{"type": "git", "uri": "https://github.com/hanmertens/han-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/hanmertens/han-overlay.git"}], "feed": ["https://github.com/hanmertens/han-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 23:34:13 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "hangul-typing": {"quality": "experimental", "status": "unofficial", "name": "hangul-typing", "description": {"en": "It contains hangul-typing tutors."}, "homepage": "https://gitlab.com/espresso.tiger/hangul-typing", "owner": [{"type": "person", "email": "espresso.tiger@gmail.com", "name": "espresso tiger"}], "source": [{"type": "git", "uri": "https://gitlab.com/espresso.tiger/hangul-typing.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/espresso.tiger/hangul-typing.git"}], "feed": ["https://gitlab.com/espresso.tiger/hangul-typing/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-12-23 22:47:42 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "haskell"], "x-ebuild-count": 3}, "haskell": {"quality": "experimental", "status": "official", "name": "haskell", "description": {"en": "The Official Gentoo Haskell overlay."}, "homepage": "https://github.com/gentoo-haskell", "owner": [{"type": "project", "email": "haskell@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "git://github.com/gentoo-haskell/gentoo-haskell.git"}, {"type": "git", "uri": "https://github.com/gentoo-haskell/gentoo-haskell.git"}], "feed": ["https://github.com/gentoo-haskell/gentoo-haskell/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 18:25:19 +1100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2483}, "heindsight": {"quality": "experimental", "status": "unofficial", "name": "heindsight", "description": {"en": "heindsight's personal overlay"}, "homepage": "https://github.com/heindsight/gentoo_overlay", "owner": [{"type": "person", "email": "heindsight@kruger.dev", "name": "Heinrich Kruger"}], "source": [{"type": "git", "uri": "https://github.com/heindsight/gentoo_overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/heindsight/gentoo_overlay.git"}], "feed": ["https://github.com/heindsight/gentoo_overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-18 18:40:23 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "hering-overlay": {"quality": "experimental", "status": "unofficial", "name": "hering-overlay", "description": {"en": "Richard Hering's gentoo overlay"}, "homepage": "https://github.com/internethering/hering-overlay", "owner": [{"type": "person", "email": "richard@internethering.de", "name": "Richard Hering"}], "source": [{"type": "git", "uri": "https://github.com/internethering/hering-overlay.git"}], "feed": ["https://github.com/internethering/hering-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-02 13:33:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "hexedit-overlay": {"quality": "experimental", "status": "unofficial", "name": "hexedit-overlay", "description": {"en": "Ebuilds for infrastructure-related packages and my own projects"}, "homepage": "http://hexedit.me/gentoo/", "owner": [{"type": "person", "email": "hexedit@ifproject.ru", "name": "Timofey Negrebetsky"}], "source": [{"type": "git", "uri": "https://git.ifproject.ru/hexedit/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-24 16:45:02 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "hibiscus": {"quality": "experimental", "status": "unofficial", "name": "hibiscus", "description": {"en": "Hibiscus homebanking overlay"}, "homepage": "https://cgit.gentoo.org/user/hibiscus.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/hibiscus.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/hibiscus.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/hibiscus.git"}], "feed": ["https://cgit.gentoo.org/user/hibiscus.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-10-28 17:09:06 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "holgersson-overlay": {"quality": "experimental", "status": "unofficial", "name": "holgersson-overlay", "description": {"en": "Nils \"holgersson\" Freydank's personal overlay"}, "homepage": "https://git.holgersson.xyz", "owner": [{"type": "person", "email": "holgersson@posteo.de", "name": "Nils Freydank"}], "source": [{"type": "git", "uri": "https://git.holgersson.xyz/foss/holgersson-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 17:37:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "hossie": {"quality": "experimental", "status": "unofficial", "name": "hossie", "description": {"en": "gentoo-overlay from hossie"}, "homepage": "https://git.hossie.de/projects/GEN/repos/gentoo-overlay/browse", "owner": [{"type": "person", "email": "hossie@hossie.de"}], "source": [{"type": "git", "uri": "https://git.hossie.de/scm/gen/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:21:47 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "hotstoast": {"quality": "experimental", "status": "unofficial", "name": "hotstoast", "description": {"en": "Tom Hotston's personal overlay"}, "homepage": "https://github.com/TomHotston/hotstoast-overlay", "owner": [{"type": "person", "email": "hotston.tom@gmail.com", "name": "Tom Hotston"}], "source": [{"type": "git", "uri": "https://github.com/TomHotston/hotstoast-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/TomHotston/hotstoast-overlay.git"}], "feed": ["https://github.com/TomHotston/hotstoast-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 03:29:07 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "ikelos": {"quality": "experimental", "status": "unofficial", "name": "ikelos", "description": {"en": "Ikelos's hospice for broken and damaged ebuilds."}, "homepage": "https://cgit.gentoo.org/dev/ikelos.git/", "owner": [{"type": "person", "email": "ikelos@gentoo.org", "name": "Mike Auty"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ikelos.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ikelos.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ikelos.git"}], "feed": ["https://cgit.gentoo.org/dev/ikelos.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 10:31:16 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 104}, "ixit": {"quality": "experimental", "status": "unofficial", "name": "ixit", "description": {"en": "iXit overlay"}, "homepage": "https://github.com/okias/ixit", "owner": [{"type": "person", "email": "david@ixit.cz", "name": "David Heidelberger"}], "source": [{"type": "git", "uri": "https://github.com/okias/ixit.git"}, {"type": "git", "uri": "git://github.com/okias/ixit.git"}, {"type": "git", "uri": "git@github.com:okias/ixit.git"}], "feed": ["https://github.com/okias/ixit/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-11 15:08:56 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "jacendi-overlay": {"quality": "experimental", "status": "unofficial", "name": "jacendi-overlay", "description": {"en": "id Software games overlay"}, "homepage": "https://bitbucket.org/jacendi/jacendi-overlay", "owner": [{"type": "person", "email": "jacendi@protonmail.com", "name": "Vladimir Gavrilov"}], "source": [{"type": "git", "uri": "https://bitbucket.org/jacendi/jacendi-overlay"}], "feed": ["https://bitbucket.org/jacendi/jacendi-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 06:34:02 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "jamesbroadhead": {"quality": "experimental", "status": "unofficial", "name": "jamesbroadhead", "description": {"en": "James Broadhead's personal overlay and pre-sunrise testing ground"}, "homepage": "https://cgit.gentoo.org/user/jamesbroadhead.git/", "owner": [{"type": "person", "email": "jamesbroadhead@gmail.com", "name": "James Broadhead"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/jamesbroadhead.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/jamesbroadhead.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/jamesbroadhead.git"}], "feed": ["https://cgit.gentoo.org/user/jamesbroadhead.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-25 09:15:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "java": {"quality": "experimental", "status": "official", "name": "java", "description": {"en": "Java overlay"}, "homepage": "https://cgit.gentoo.org/proj/java.git/", "owner": [{"type": "project", "email": "java@gentoo.org", "name": "Gentoo Java team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/java.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/java.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/java.git"}], "feed": ["https://cgit.gentoo.org/proj/java.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-25 11:41:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 131}, "jboro-overlay": {"quality": "experimental", "status": "unofficial", "name": "jboro-overlay", "description": {"en": "personal experimental ebuilds"}, "homepage": "https://github.com/JBoro/portage", "owner": [{"type": "person", "email": "justin.borodinsky@gmail.com", "name": "justin borodinsky"}], "source": [{"type": "git", "uri": "https://github.com/JBoro/portage.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-08 11:25:17 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "jkolo": {"quality": "experimental", "status": "unofficial", "name": "jkolo", "description": {"en": "Jerzy Kolosowski's Gentoo overlay"}, "homepage": "https://git.kolosowscy.pl/jurek/gentoo-overlay", "owner": [{"type": "person", "email": "jerzy@kolosowscy.pl", "name": "Jerzy Kolosowski"}], "source": [{"type": "git", "uri": "https://git.kolosowscy.pl/jurek/gentoo-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-01 13:22:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "jm-overlay": {"quality": "experimental", "status": "unofficial", "name": "jm-overlay", "description": {"en": "Personal overlay with more or less random ebuilds"}, "homepage": "https://github.com/Jannis234/jm-overlay", "owner": [{"type": "person", "email": "jannis@ctrl-c.xyz", "name": "Jannis234"}], "source": [{"type": "git", "uri": "https://github.com/Jannis234/jm-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 14:15:50 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 933}, "jmbsvicetto": {"quality": "experimental", "status": "official", "name": "jmbsvicetto", "description": {"en": "Jorge Manuel B. S. Vicetto developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/jmbsvicetto.git", "owner": [{"type": "person", "email": "jmbsvicetto@gentoo.org", "name": "Jorge Manuel B. S. Vicetto"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/jmbsvicetto.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/jmbsvicetto.git"}], "feed": ["https://cgit.gentoo.org/dev/jmbsvicetto.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-22 09:20:47 -0100\n", "x-openpgp-signed": "Y", "x-masters": ["gentoo"], "x-ebuild-count": 75}, "johnmh": {"quality": "experimental", "status": "unofficial", "name": "johnmh", "description": {"en": "Personal overlay of johnmh"}, "homepage": "https://cgit.gentoo.org/repo/user/johnmh.git/", "owner": [{"type": "person", "email": "johnmh@openblox.org", "name": "John Harris"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/johnmh.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/johnmh"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/johnmh.git"}], "feed": ["https://cgit.gentoo.org/repo/user/johnmh.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-10-15 23:51:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "johu": {"quality": "experimental", "status": "official", "name": "johu", "description": {"en": "Johannes Huber developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/johu.git", "owner": [{"type": "person", "email": "johu@gentoo.org", "name": "Johannes Huber"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/johu.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/johu.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/johu.git"}], "feed": ["https://cgit.gentoo.org/dev/johu.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-18 11:42:18 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "jorgicio": {"quality": "experimental", "status": "unofficial", "name": "jorgicio", "description": {"en": "Gentoo repository made by Jorgicio."}, "homepage": "https://github.com/jorgicio/jorgicio-gentoo", "owner": [{"type": "person", "email": "jpizarrocallejas@gmail.com", "name": "Jorge Pizarro Callejas"}], "source": [{"type": "git", "uri": "https://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git://github.com/jorgicio/jorgicio-gentoo.git"}, {"type": "git", "uri": "git@github.com:jorgicio/jorgicio-gentoo.git"}], "feed": ["https://github.com/jorgicio/jorgicio-gentoo/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 16:01:53 -0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 521}, "jsteward": {"quality": "experimental", "status": "unofficial", "name": "jsteward", "description": {"en": "jsteward's personal overlay"}, "homepage": "https://github.com/KireinaHoro/jsteward", "owner": [{"type": "person", "email": "i@jsteward.moe", "name": "KireinaHoro"}], "source": [{"type": "git", "uri": "https://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git://github.com/KireinaHoro/jsteward.git"}, {"type": "git", "uri": "git@github.com:KireinaHoro/jsteward.git"}], "feed": ["https://github.com/KireinaHoro/jsteward/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 13:11:37 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "junkdrawer": {"quality": "experimental", "status": "unofficial", "name": "junkdrawer", "description": {"en": "Various development tools, libraries, and patches not in Gentoo (yet)"}, "homepage": "https://github.com/doctaweeks/junkdrawer-overlay", "owner": [{"type": "person", "email": "dan@danweeks.net", "name": "Daniel M. Weeks"}], "source": [{"type": "git", "uri": "https://github.com/doctaweeks/junkdrawer-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 12:41:53 -0400\n", "x-openpgp-signed": "N", "x-masters": ["dlang", "gentoo"], "x-ebuild-count": 342}, "kaa": {"quality": "experimental", "status": "unofficial", "name": "kaa", "description": {"en": "Kaa's experimental overlay"}, "homepage": "http://www.kaa.org.ua", "owner": [{"type": "person", "email": "oleg@kaa.org.ua", "name": "Oleg Kravchenko"}], "source": [{"type": "git", "uri": "https://github.com/Oleh-Kravchenko/kaa-layman.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-13 15:22:42 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "kde": {"quality": "experimental", "status": "official", "name": "kde", "description": {"en": "Official KDE team's testing overlay."}, "homepage": "https://kde.gentoo.org", "owner": [{"type": "project", "email": "kde@gentoo.org", "name": "KDE Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kde.git"}, {"type": "git", "uri": "https://github.com/gentoo/kde.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kde.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kde.git"}], "feed": ["https://cgit.gentoo.org/proj/kde.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 22:18:07 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 551}, "keepbot-overlay": {"quality": "experimental", "status": "unofficial", "name": "keepbot-overlay", "description": {"en": "keepbot's personal ebuild repository"}, "homepage": "https://github.com/d-k-ivanov/gentoo-overlay.git", "owner": [{"type": "person", "email": "d.k.ivanov@live.com", "name": "Dmitry Ivanov"}], "source": [{"type": "git", "uri": "https://github.com/d-k-ivanov/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/d-k-ivanov/gentoo-overlay.git"}], "feed": ["https://github.com/d-k-ivanov/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 01:48:27 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "khoverlay": {"quality": "experimental", "status": "unofficial", "name": "khoverlay", "description": {"en": "Khumba's overlay, mainly Haskell packages"}, "homepage": "https://gitlab.com/khumba/khoverlay", "owner": [{"type": "person", "email": "bog@khumba.net", "name": "Bryan Gardiner"}], "source": [{"type": "git", "uri": "https://gitlab.com/khumba/khoverlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/khumba/khoverlay.git"}], "feed": ["https://gitlab.com/khumba/khoverlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 18:26:47 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 98}, "klondike": {"quality": "experimental", "status": "unofficial", "name": "klondike", "description": {"en": "Ebuilds made and modified by klondike, mainly sound and virtualization"}, "homepage": "https://cgit.gentoo.org/user/klondike.git/", "owner": [{"type": "person", "email": "klondike@gentoo.org", "name": "Francisco Blas Izquierdo Riera"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/klondike.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/klondike.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/klondike.git"}], "feed": ["https://cgit.gentoo.org/user/klondike.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-01 00:06:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "konsolebox": {"quality": "experimental", "status": "unofficial", "name": "konsolebox", "description": {"en": "konsolebox's overlay"}, "homepage": "https://github.com/konsolebox/overlay", "owner": [{"type": "person", "email": "konsolebox@gmail.com", "name": "konsolebox"}], "source": [{"type": "git", "uri": "https://github.com/konsolebox/overlay.git"}], "feed": ["https://github.com/konsolebox/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 04:12:04 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "kripton-overlay": {"quality": "experimental", "status": "unofficial", "name": "kripton-overlay", "description": {"en": "Gentoo portage overlay with packages needed or developed by kripton"}, "homepage": "https://github.com/kripton/kripton-overlay", "owner": [{"type": "person", "email": "kripton@kripserver.net", "name": "Jannis Achstetter"}], "source": [{"type": "git", "uri": "https://github.com/kripton/kripton-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/kripton/kripton-overlay.git"}], "feed": ["https://github.com/kripton/kripton-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 21:22:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "kske": {"quality": "experimental", "status": "unofficial", "name": "kske", "description": {"en": "Kai S. K. Engelbart's personal overlay"}, "homepage": "https://git.kske.dev/kske/gentoo-overlay", "owner": [{"type": "person", "email": "kai@kske.dev", "name": "Kai S. K. Engelbart"}], "source": [{"type": "git", "uri": "https://git.kske.dev/kske/gentoo-overlay.git"}, {"type": "git", "uri": "ssh://git@git.kske.dev:420/kske/gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-25 09:56:54 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "lanodanOverlay": {"quality": "experimental", "status": "unofficial", "name": "lanodanOverlay", "description": {"en": "Additionnal goals; experiments, necromancy, portability, diversity, \u2026", "fr": "Buts additionnels; Exp\u00e9rimentations, n\u00e9cromancie, portabilit\u00e9e, diversit\u00e9e, \u2026"}, "homepage": "https://hacktivis.me/git/overlay", "owner": [{"type": "person", "email": "contact@hacktivis.me", "name": "Haelwenn (lanodan) Monnier"}], "source": [{"type": "git", "uri": "https://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "https://gitlab.com/lanodan/overlay.git"}, {"type": "git", "uri": "git://hacktivis.me/git/overlay.git"}, {"type": "git", "uri": "git://gitlab.com/lanodan/overlay.git"}], "feed": ["https://hacktivis.me/git/overlay/atom.xml"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-28 10:51:37 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 213}, "laurentb": {"quality": "experimental", "status": "unofficial", "name": "laurentb", "description": {"en": "Various packages"}, "homepage": "https://github.com/laurentb/gentoo-overlay", "owner": [{"type": "person", "email": "laurent@bachelier.name", "name": "Laurent Bachelier"}], "source": [{"type": "git", "uri": "git://github.com/laurentb/gentoo-overlay.git"}, {"type": "git", "uri": "https://github.com/laurentb/gentoo-overlay.git"}], "feed": ["https://github.com/feeds/laurentb/commits/gentoo-overlay/master"], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-27 20:38:31 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "leechcraft": {"quality": "experimental", "status": "unofficial", "name": "leechcraft", "description": {"en": "Overlay with LeechCraft ebuilds"}, "homepage": "https://github.com/0xd34df00d/leechcraft-overlay", "owner": [{"type": "person", "email": "0xd34df00d@gmail.com", "name": "Georg Rudoy"}], "source": [{"type": "git", "uri": "https://github.com/0xd34df00d/leechcraft-overlay.git"}, {"type": "git", "uri": "git://github.com/0xd34df00d/leechcraft-overlay.git"}], "feed": ["https://github.com/0xd34df00d/leechcraft-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 10:01:13 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "leio": {"quality": "experimental", "status": "official", "name": "leio", "description": {"en": "Mart Raudsepp developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/leio.git", "owner": [{"type": "person", "email": "leio@gentoo.org", "name": "Mart Raudsepp"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/leio.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/leio.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/leio.git"}], "feed": ["https://cgit.gentoo.org/dev/leio.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-30 22:07:20 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "levenkov": {"quality": "experimental", "status": "unofficial", "name": "levenkov", "description": {"en": "levenkov personal overlay"}, "homepage": "https://cgit.gentoo.org/user/levenkov.git", "owner": [{"type": "person", "email": "artem@levenkov.org", "name": "Artem Levenkov"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/levenkov.git"}, {"type": "git", "uri": "http://cgit.gentooexperimental.org/user/levenkov.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/levenkov.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2015-02-20 13:13:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "librepilot": {"quality": "experimental", "status": "unofficial", "name": "librepilot", "description": {"en": "Librepilot flight control software overlay"}, "homepage": "https://github.com/paul-jewell/librepilot-overlay", "owner": [{"type": "person", "email": "paul@teulu.org", "name": "Paul Jewell"}], "source": [{"type": "git", "uri": "https://github.com/paul-jewell/librepilot-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/paul-jewell/librepilot-overlay.git"}], "feed": ["https://github.com/paul-jewell/librepilot-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-22 17:16:47 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "libressl": {"quality": "experimental", "status": "official", "name": "libressl", "description": {"en": "LibreSSL ebuilds testing repository"}, "homepage": "https://wiki.gentoo.org/wiki/Project:LibreSSL", "owner": [{"type": "project", "email": "libressl@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/libressl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/libressl.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/libressl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-03 20:12:55 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 87}, "liftm": {"quality": "experimental", "status": "unofficial", "name": "liftm", "description": {"en": "Personal Overlay"}, "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/liftm-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/liftm-overlay.git"}], "feed": ["https://github.com/jcaesar/liftm-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 18:38:40 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "linux-be": {"quality": "experimental", "status": "unofficial", "name": "linux-be", "description": {"en": "Port of Boot Environments for GNU/Linux"}, "homepage": "https://gitlab.com/linux-be", "owner": [{"type": "person", "email": "vitaut.bayaryn@gmail.com", "name": "Witaut Bajaryn"}, {"type": "person", "email": "a.mistewicz@gmail.com", "name": "Aleksander Mistewicz"}], "source": [{"type": "git", "uri": "https://gitlab.com/linux-be/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/linux-be/overlay.git"}], "feed": ["https://gitlab.com/linux-be/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 16:03:55 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "linuxunderground-overlay": {"quality": "experimental", "status": "unofficial", "name": "linuxunderground-overlay", "description": {"en": "experimental ebuilds from linuxunderground.be"}, "homepage": "https://github.com/linuxunderground/gentoo.overlay", "owner": [{"type": "person", "email": "vincent.hardy.be@gmail.com", "name": "linuxunderground"}], "source": [{"type": "git", "uri": "git://github.com/linuxunderground/gentoo.overlay.git"}, {"type": "git", "uri": "https://github.com/linuxunderground/gentoo.overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-11 21:41:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 155}, "linxon": {"quality": "experimental", "status": "unofficial", "name": "linxon", "description": {"en": "linxon personal overlay"}, "homepage": "https://github.com/linxon/gentoo-overlay", "owner": [{"type": "person", "email": "email@linxon.ru", "name": "linxon"}], "source": [{"type": "git", "uri": "https://github.com/linxon/gentoo-overlay.git"}], "feed": ["https://github.com/linxon/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-24 16:43:15 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 198}, "lisp": {"quality": "experimental", "status": "official", "name": "lisp", "description": {"en": "Common Lisp/Scheme development, recruitment and live overlay.\n Support and feedback in `#gentoo-lisp' and via\n `gentoo-lisp@lists.gentoo.org'."}, "homepage": "https://cgit.gentoo.org/proj/lisp.git", "owner": [{"type": "project", "email": "lisp@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/lisp.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/lisp.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/lisp.git"}], "feed": ["https://cgit.gentoo.org/proj/lisp.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-12-21 13:59:34 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 381}, "lmiphay": {"quality": "experimental", "status": "unofficial", "name": "lmiphay", "description": {"en": "Personal overlay of Paul Healy"}, "homepage": "https://cgit.gentoo.org/user/lmiphay.git/", "owner": [{"type": "person", "email": "lmiphay@gmail.com", "name": "Paul Healy"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/user/lmiphay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 11:47:32 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 230}, "lto-overlay": {"quality": "experimental", "status": "unofficial", "name": "lto-overlay", "description": {"en": "A Portage configuration for O3, Graphite, and LTO system-wide"}, "homepage": "https://github.com/InBetweenNames/gentooLTO", "owner": [{"type": "person", "email": "lookatyouhacker@gmail.com", "name": "Shane Peelar"}], "source": [{"type": "git", "uri": "https://github.com/InBetweenNames/gentooLTO.git"}, {"type": "git", "uri": "git+ssh://git@github.com:InBetweenNames/gentooLTO.git"}], "feed": ["https://github.com/InBetweenNames/gentooLTO/commits/master"], "x-state": "GOOD", "x-timestamp": "2021-03-21 16:50:02 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "mv"], "x-ebuild-count": 13}, "luke-jr": {"quality": "experimental", "status": "unofficial", "name": "luke-jr", "description": {"en": "Misc ebuilds by Luke-Jr"}, "homepage": "http://luke.dashjr.org", "owner": [{"type": "person", "email": "luke-jr+gentoobugs@utopios.org"}], "source": [{"type": "git", "uri": "https://scm.dashjr.org/scmroot/git/portage-overlays/luke-jr"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 23:01:46 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 179}, "luxifer": {"quality": "experimental", "status": "unofficial", "name": "luxifer", "description": {"en": "Personal Overlay, contains stoken ebuilds"}, "homepage": "https://github.com/luxifr/olgentoo", "owner": [{"type": "person", "email": "dhertel@gmail.com", "name": "Dominik Keil"}], "source": [{"type": "git", "uri": "https://github.com/luxifr/olgentoo.git"}], "feed": ["https://github.com/luxifr/olgentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-04-04 07:38:43 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "lxde-gtk3": {"quality": "experimental", "status": "unofficial", "name": "lxde-gtk3", "description": {"en": "lxde-gtk3 overlay"}, "homepage": "https://github.com/rilian-la-te/lxde-gtk3-overlay", "owner": [{"type": "person", "email": "ria.freelander@gmail.com", "name": "Konstantin"}], "source": [{"type": "git", "uri": "https://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git://github.com/rilian-la-te/lxde-gtk3-overlay.git"}, {"type": "git", "uri": "git@github.com:rilian-la-te/lxde-gtk3-overlay.git"}], "feed": ["https://github.com/rilian-la-te/lxde-gtk3-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-02-12 16:03:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "maekke": {"quality": "experimental", "status": "official", "name": "maekke", "description": {"en": "Markus Meier developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/maekke.git", "owner": [{"type": "person", "email": "maekke@gentoo.org", "name": "Markus Meier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/maekke.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/maekke.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/maekke.git"}], "feed": ["https://cgit.gentoo.org/dev/maekke.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-20 18:42:18 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mate-de-gentoo": {"quality": "experimental", "status": "unofficial", "name": "mate-de-gentoo", "description": {"en": "Updated ebuilds for mate-desktop environment"}, "homepage": "https://github.com/oz123/mate-de-gentoo", "owner": [{"type": "person", "email": "oz.tiram@gmail.com", "name": "OzTiram"}], "source": [{"type": "git", "uri": "https://github.com/oz123/mate-de-gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-15 22:17:12 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 114}, "matrix": {"quality": "experimental", "status": "official", "name": "matrix", "description": {"en": "Overlay containing clients, servers and services for the Matrix protocol", "nl": "Overlay met clients, servers en services voor het Matrix protocol"}, "homepage": "https://github.com/gentoo/matrix", "owner": [{"type": "person", "email": "steils@gentoo.org", "name": "Stefan Strogin"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/matrix.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/proj/matrix.git"}], "feed": ["https://cgit.gentoo.org/repo/proj/matrix.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-10-15 18:52:27 +0300\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "megacoffee": {"quality": "experimental", "status": "unofficial", "name": "megacoffee", "description": {"en": "Mixed ebuilds from various sources: self-written missing ebuilds, more current ebuilds, ebuilds that just needed a slight update from official portage, ebuilds others posted on Gentoo Bugzilla, ebuilds with added patches, old ebuilds that were removed from official portage etc.", "de": "Verschiedene ebuilds aus verschiedenen Quellen: selbsterstellte ebuilds, ebuilds mit geringf\u00fcgigen \u00c4nderungen, gegen\u00fcber dem aktuellen Baum, ebuilds aus Gentoos Bugzilla, ebuilds mit erweiterten patches, alte ebuilds die nicht mehr im offiziellen Baum existieren, etc."}, "homepage": "http://gentoo-overlay.megacoffee.net", "owner": [{"type": "person", "email": "gentoo-overlay@megacoffee.net", "name": "MegaCoffee"}], "source": [{"type": "git", "uri": "https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git"}], "feed": ["https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-02-28 13:36:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo", "go-overlay"], "x-ebuild-count": 34}, "menelkir": {"quality": "experimental", "status": "unofficial", "name": "menelkir", "description": {"en": "Various ebuilds from different sources"}, "homepage": "https://gitlab.com/menelkir/gentoo-overlay", "owner": [{"type": "person", "email": "menelkir@itroll.org", "name": "Daniel Menelkir"}], "source": [{"type": "git", "uri": "https://gitlab.com/menelkir/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/menelkir/gentoo-overlay.git"}], "feed": ["https://gitlab.com/menelkir/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:07:37 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 443}, "metahax": {"quality": "experimental", "status": "unofficial", "name": "metahax", "description": {"en": "Some ebuilds that didn't seem to exist yet."}, "homepage": "https://github.com/metafarion/metahax", "owner": [{"type": "person", "email": "miles@ctrl-shift.net", "name": "Miles V."}], "source": [{"type": "git", "uri": "https://github.com/metafarion/metahax.git"}], "feed": ["https://github.com/metafarion/metahax/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-30 12:45:00 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "milos-rs": {"quality": "experimental", "status": "unofficial", "name": "milos-rs", "description": {"en": "A pocket repository for few unavailable packages"}, "homepage": "https://github.com/milos-rs/gentoo-overlay", "owner": [{"type": "person", "email": "milos.om.dj@gmail.com", "name": "Milo\u0161 E. \u0110ur\u0111evi\u0107"}], "source": [{"type": "git", "uri": "https://github.com/milos-rs/gentoo-overlay.git"}], "feed": ["https://github.com/milos-rs/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-09 04:50:35 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "miramir": {"quality": "experimental", "status": "unofficial", "name": "miramir", "description": {"en": "Miramir repository"}, "homepage": "https://github.com/miramir/miramir-layman", "owner": [{"type": "person", "email": "gmiramir@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/miramir/miramir-layman.git"}], "feed": ["https://github.com/miramir/miramir-layman/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 09:00:44 +0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 42}, "mklich": {"quality": "experimental", "status": "unofficial", "name": "mklich", "description": {"en": "For learning purposes."}, "homepage": "https://cgit.gentoo.org/user/mklich.git/", "owner": [{"type": "person", "email": "michal@michalklich.com", "name": "Micha\u0142 Klich"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mklich.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mklich.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mklich.git"}], "feed": ["https://cgit.gentoo.org/user/mklich.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2015-09-24 07:21:41 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "mkr-overlay": {"quality": "experimental", "status": "unofficial", "name": "mkr-overlay", "description": {"en": "MalakymR's overlay"}, "homepage": "https://github.com/MalakymR/mkr-overlay", "owner": [{"type": "person", "email": "MalakymR@esdf.uk"}], "source": [{"type": "git", "uri": "https://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git://github.com/MalakymR/mkr-overlay.git"}, {"type": "git", "uri": "git@github.com:MalakymR/mkr-overlay.git"}], "feed": ["https://github.com/MalakymR/mkr-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-03-12 11:24:30 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "moaxcp": {"quality": "experimental", "status": "unofficial", "name": "moaxcp", "description": {"en": "gentoo overlay for packages"}, "homepage": "https://github.com/moaxcp/moaxcp-gentoo-overlay", "owner": [{"type": "person", "email": "moaxcp@gmail.com", "name": "John Mercier"}], "source": [{"type": "git", "uri": "https://github.com/moaxcp/moaxcp-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2015-08-11 18:15:55 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "moexiami": {"quality": "testing", "status": "unofficial", "name": "moexiami", "description": {"en": "Contains updated ebuilds (w/ more feature/control)\n for packages in the Gentoo tree, latest version ebuilds and newpackages\n not yet in the tree. Targeting high-quality for production use."}, "homepage": "https://github.com/Xiami2012/moexiami-ovl-dev", "owner": [{"type": "person", "email": "i@f2light.com", "name": "Xiami"}], "source": [{"type": "git", "uri": "https://github.com/Xiami2012/moexiami-ovl-sync.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Xiami2012/moexiami-ovl-sync.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-01 23:22:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "moltonel": {"quality": "experimental", "status": "unofficial", "name": "moltonel", "description": {"en": "Vincent de Phily's private overlay"}, "homepage": "https://github.com/vincentdephily/moltonel-ebuilds/", "owner": [{"type": "person", "email": "moltonel@gmail.com", "name": "Vincent de Phily"}], "source": [{"type": "git", "uri": "git://github.com/vincentdephily/moltonel-ebuilds.git"}], "x-state": "GOOD", "x-timestamp": "2020-12-26 18:30:33 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "monero": {"quality": "experimental", "status": "unofficial", "name": "monero", "description": {"en": "Ebuilds for the Monero cryptocurrency and\n related software."}, "homepage": "https://github.com/gentoo-monero/gentoo-monero", "owner": [{"type": "person", "email": "matt@offtopica.uk", "name": "Matt Smith"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-monero/gentoo-monero.git"}, {"type": "git", "uri": "git+ssh://git@github.com/gentoo-monero/gentoo-monero.git"}], "feed": ["https://github.com/gentoo-monero/gentoo-monero/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-19 22:24:23 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "mschiff": {"quality": "experimental", "status": "official", "name": "mschiff", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/dev/mschiff.git/", "owner": [{"type": "person", "email": "mschiff@gentoo.org", "name": "Marc Schiffbauer"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/mschiff.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/mschiff.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/mschiff.git"}], "feed": ["https://cgit.gentoo.org/dev/mschiff.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-08 01:02:40 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "multilib-portage": {"quality": "experimental", "status": "official", "name": "multilib-portage", "description": {"en": "multilib-overlay: emul-linux-x86 must die ;)"}, "homepage": "https://cgit.gentoo.org/proj/multilib-portage.git/", "owner": [{"type": "person", "email": "tommy@gentoo.org", "name": "Thomas Sachau"}], "source": [{"type": "git", "uri": "git://anongit.gentoo.org/proj/multilib-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-14 17:48:50 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "musl": {"quality": "experimental", "status": "official", "name": "musl", "description": {"en": "musl development overlay"}, "homepage": "https://cgit.gentoo.org/proj/musl.git/", "owner": [{"type": "project", "email": "musl@gentoo.org", "name": "Gentoo musl team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/musl.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/musl.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/musl.git"}], "feed": ["https://cgit.gentoo.org/proj/musl.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:41:13 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 132}, "musl-clang": {"quality": "experimental", "status": "unofficial", "name": "musl-clang", "description": {"en": "musl clang/libc++ overlay"}, "homepage": "https://github.com/karlguy/musl-clang/", "owner": [{"type": "person", "email": "bjornpagen@gmail.com", "name": "Bjorn Pagen"}], "source": [{"type": "git", "uri": "https://github.com/karlguy/musl-clang"}, {"type": "git", "uri": "git://github.com/karlguy/musl-clang"}], "feed": ["https://github.com/karlguy/musl-clang/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-03-01 16:56:29 -0500\n", "x-openpgp-signed": "E", "x-masters": ["musl", "gentoo"], "x-ebuild-count": 1}, "mv": {"quality": "experimental", "status": "unofficial", "name": "mv", "description": {"en": "Ebuilds for packages not in the Gentoo tree\n (lack of maintainer or too experimental) and live ebuilds\n or extensions/bugfixes for packages in the tree"}, "homepage": "https://cgit.gentoo.org/user/mv.git", "owner": [{"type": "person", "email": "martin@mvath.de", "name": "Martin V\u00e4th"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/mv.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/mv.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/mv.git"}], "feed": ["https://cgit.gentoo.org/user/mv.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-21 09:16:07 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 158}, "mva": {"quality": "experimental", "status": "unofficial", "name": "mva", "description": {"en": "mva's sandbox overlay"}, "homepage": "https://github.com/msva/mva-overlay/", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/msva/mva-overlay"}, {"type": "git", "uri": "git://github.com/msva/mva-overlay"}], "feed": ["https://github.com/msva/mva-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 23:30:16 +0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 550}, "myrvolay": {"quality": "experimental", "status": "unofficial", "name": "myrvolay", "description": {"en": "myrvogna's personal Gentoo overlay"}, "homepage": "https://github.com/myrvogna/myrvolay", "owner": [{"type": "person", "email": "octiabrina@myrvogna.net", "name": "Octiabrina Terrien-Puig"}], "source": [{"type": "git", "uri": "https://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git://github.com/myrvogna/myrvolay.git"}, {"type": "git", "uri": "git@github.com:myrvogna/myrvolay.git"}], "feed": ["https://github.com/myrvogna/myrvolay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-18 14:49:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 28}, "mysql": {"quality": "experimental", "status": "official", "name": "mysql", "description": {"en": "Gentoo MySQL overlay"}, "homepage": "https://cgit.gentoo.org/proj/mysql.git/", "owner": [{"type": "project", "email": "mysql-bugs@gentoo.org", "name": "MySQL Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/mysql.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/mysql.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/mysql.git"}], "feed": ["https://cgit.gentoo.org/proj/mysql.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-12 01:11:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "natinst": {"quality": "experimental", "status": "unofficial", "name": "natinst", "description": {"en": "VISA and National Instruments drivers"}, "homepage": "https://github.com/AndrewAmmerlaan/natinst", "owner": [{"type": "person", "email": "andrewammerlaan@riseup.net", "name": "Andrew Ammerlaan"}], "source": [{"type": "git", "uri": "https://github.com/AndrewAmmerlaan/natinst.git"}, {"type": "git", "uri": "git+ssh://git@github.com/AndrewAmmerlaan/natinst.git"}], "feed": ["https://github.com/AndrewAmmerlaan/natinst/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-18 19:41:13 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1644}, "nelson-graca": {"quality": "experimental", "status": "unofficial", "name": "nelson-graca", "description": {"en": "Nelson Gra\u00e7a personal Overlay"}, "homepage": "https://github.com/nelsongraca/gentoo-overlay", "owner": [{"type": "person", "email": "graca.nelson@gmail.com", "name": "Nelson Gra\u00e7a"}], "source": [{"type": "git", "uri": "https://github.com/nelsongraca/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nelsongraca/gentoo-overlay.git"}], "feed": ["https://github.com/nelsongraca/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-19 16:10:15 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "nest": {"quality": "experimental", "status": "unofficial", "name": "nest", "description": {"en": "Personal Gentoo overlay"}, "homepage": "https://github.com/SpiderX/portage-overlay", "owner": [{"type": "person", "email": "spiderx@spiderx.dp.ua", "name": "Vladimir Pavljuchenkov"}], "source": [{"type": "git", "uri": "https://github.com/SpiderX/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/SpiderX/portage-overlay.git"}], "feed": ["https://github.com/SpiderX/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 23:01:18 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 1010}, "nico": {"quality": "experimental", "status": "unofficial", "name": "nico", "description": {"en": "various ebuilds"}, "homepage": "https://cgit.gentoo.org/user/nico.git/", "owner": [{"type": "person", "email": "nico@overninethousand.de", "name": "Nico Suhl"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/nico.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/nico.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/nico.git"}], "feed": ["https://cgit.gentoo.org/user/nico.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-25 19:06:03 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "nitratesky": {"quality": "experimental", "status": "unofficial", "name": "nitratesky", "description": {"en": "Personal overlay of Vladimir Timofeenko"}, "homepage": "https://github.com/VTimofeenko/nitratesky", "owner": [{"type": "person", "email": "overlay.maintain@vtimofeenko.com", "name": "Vladimir Timofeenko"}], "source": [{"type": "git", "uri": "https://github.com/VTimofeenko/nitratesky.git"}, {"type": "git", "uri": "git+ssh://git@github.com/VTimofeenko/nitratesky.git"}], "feed": ["https://github.com/VTimofeenko/nitratesky/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 10:25:43 -0700\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "nest"], "x-ebuild-count": 48}, "nix-guix": {"quality": "experimental", "status": "official", "name": "nix-guix", "description": {"en": "Overlay for nix anf guix functional package managers"}, "homepage": "https://github.com/trofi/nix-guix-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/nix-guix-gentoo.git"}], "feed": ["https://github.com/trofi/nix-guix-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-06 09:14:39 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "np-hardass-overlay": {"quality": "experimental", "status": "unofficial", "name": "np-hardass-overlay", "description": {"en": "NP-Hardass's Personal Overlay"}, "homepage": "https://github.com/np-hardass/np-hardass-overlay", "owner": [{"type": "person", "email": "NP-Hardass@gentoo.org", "name": "NP-Hardass"}], "source": [{"type": "git", "uri": "https://github.com/np-hardass/np-hardass-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-12-21 15:12:55 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "nx": {"quality": "experimental", "status": "official", "name": "nx", "description": {"en": "Overlay for the NX/FreeNX packages for Gentoo."}, "homepage": "https://cgit.gentoo.org/proj/nx.git/", "owner": [{"type": "project", "email": "nx@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/nx.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/nx.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/nx.git"}], "feed": ["https://cgit.gentoo.org/proj/nx.git/atom/"], "x-state": "GOOD", "x-timestamp": "2018-08-08 21:48:58 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "nymphos": {"quality": "experimental", "status": "unofficial", "name": "nymphos", "description": {"en": "Overlay for ebuilds used in NymphOS"}, "homepage": "https://git.nymphos.ga/", "owner": [{"type": "person", "email": "neeshy@tfwno.gf"}], "source": [{"type": "git", "uri": "https://git.nymphos.ga/anon/nymphos"}], "feed": ["https://git.nymphos.ga/nymphos/atom"], "x-timestamp-command": ["git", "log", "--format=%ci", "-1"], "x-openpgp-signature-command": ["git", "show", "-q", "--pretty=format:%G?", "HEAD"], "x-state": "SYNC_FAIL"}, "octopus": {"quality": "experimental", "status": "unofficial", "name": "octopus", "description": {"en": "Own and claimed ebuilds"}, "homepage": "https://github.com/Bfgeshka/octopus", "owner": [{"type": "person", "email": "bfg@derpy.ru", "name": "Bfgeshka"}], "source": [{"type": "git", "uri": "https://github.com/Bfgeshka/octopus.git"}], "feed": ["https://github.com/Bfgeshka/octopus/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-01 03:32:31 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "oddlama": {"quality": "experimental", "status": "unofficial", "name": "oddlama", "description": {"en": "oddlama's gentoo overlay"}, "homepage": "https://github.com/oddlama/overlay", "owner": [{"type": "person", "email": "overlay@oddlama.org", "name": "oddlama"}], "source": [{"type": "git", "uri": "https://github.com/oddlama/overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/oddlama/overlay.git"}], "feed": ["https://github.com/oddlama/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 17:02:26 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 6}, "olifre": {"quality": "experimental", "status": "unofficial", "name": "olifre", "description": {"en": "Personal overlay of Oliver Freyermuth."}, "homepage": "https://github.com/olifre/olifre-portage", "owner": [{"type": "person", "email": "o.freyermuth@googlemail.com", "name": "Oliver Freyermuth"}], "source": [{"type": "git", "uri": "https://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git://github.com/olifre/olifre-portage.git"}, {"type": "git", "uri": "git@github.com:olifre/olifre-portage.git"}], "feed": ["https://github.com/olifre/olifre-portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 18:24:32 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "openclonk": {"quality": "experimental", "status": "unofficial", "name": "openclonk", "description": {"en": "Overlay for the game OpenClonk"}, "homepage": "http://www.openclonk.org/", "owner": [{"type": "person", "email": "gentoobug@liftm.de", "name": "Julius Michaelis"}], "source": [{"type": "git", "uri": "https://github.com/jcaesar/openclonk-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/jcaesar/openclonk-overlay.git"}], "feed": ["https://github.com/jcaesar/openclonk-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-07-30 23:29:47 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "openwrt": {"quality": "experimental", "status": "unofficial", "name": "openwrt", "description": {"en": "Overlay for network configuration packages found in OpenWRT"}, "homepage": "https://github.com/pavlix/gentoo-openwrt", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-openwrt"}], "x-state": "GOOD", "x-timestamp": "2016-09-14 11:46:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "oubliette": {"quality": "experimental", "status": "unofficial", "name": "oubliette", "description": {"en": "personal overlay of forgotten ebuilds"}, "homepage": "https://github.com/nabbi/oubliette-overlay", "owner": [{"type": "person", "email": "nic@boet.cc", "name": "nic"}], "source": [{"type": "git", "uri": "https://github.com/nabbi/oubliette-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/nabbi/oubliette-overlay.git"}], "feed": ["https://github.com/nabbi/oubliette-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 11:22:07 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "overseerr-overlay": {"quality": "experimental", "status": "unofficial", "name": "overseerr-overlay", "description": {"en": "third party overlay to install overseerr"}, "homepage": "https://github.com/chriscpritchard/overseerr-overlay", "owner": [{"type": "person", "email": "chris@christopherpritchard.co.uk", "name": "Chris Pritchard"}], "source": [{"type": "git", "uri": "https://github.com/chriscpritchard/overseerr-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:chriscpritchard/overseerr-overlay.git"}], "feed": ["https://github.com/chriscpritchard/overseerr-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 15:47:25 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "palemoon": {"quality": "experimental", "status": "unofficial", "name": "palemoon", "description": {"en": "Unofficial Gentoo overlay for the Pale Moon (http://www.palemoon.org/) web browser."}, "homepage": "https://github.com/deu/palemoon-overlay", "owner": [{"type": "person", "email": "de@uio.re", "name": "deu"}], "source": [{"type": "git", "uri": "https://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git://github.com/deu/palemoon-overlay.git"}, {"type": "git", "uri": "git@github.com:deu/palemoon-overlay.git"}], "feed": ["https://github.com/deu/palemoon-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-15 19:17:25 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 13}, "panther": {"quality": "experimental", "status": "unofficial", "name": "panther", "description": {"en": "Fun useful packages not found elsewhere"}, "homepage": "https://github.com/orangeturtle739/panther", "owner": [{"type": "person", "email": "swimgiraffe435@gmail.com", "name": "Jacob Glueck"}], "source": [{"type": "git", "uri": "https://github.com/orangeturtle739/panther.git"}, {"type": "git", "uri": "git+ssh://git@github.com/orangeturtle739/panther.git"}], "feed": ["https://github.com/orangeturtle739/panther/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 16:53:39 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "pdilung": {"quality": "experimental", "status": "unofficial", "name": "pdilung", "description": {"en": "Personal Gentoo overlay of Pavol Dilung"}, "homepage": "https://github.com/pdilung/gentoo-overlay/", "owner": [{"type": "person", "email": "pavol.dilung@gmail.com", "name": "Pavol Dilung"}], "source": [{"type": "git", "uri": "https://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pdilung/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pdilung/gentoo-overlay.git"}], "feed": ["https://github.com/pdilung/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2016-09-25 19:28:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "pentoo": {"quality": "experimental", "status": "official", "name": "pentoo", "description": {"en": "The overlay contains new or updated security tools."}, "homepage": "http://www.pentoo.ch", "owner": [{"type": "person", "email": "zerochaos@gentoo.org"}], "source": [{"type": "git", "uri": "https://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pentoo/pentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pentoo/pentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-30 21:24:57 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 1310}, "perl-experimental": {"quality": "experimental", "status": "official", "name": "perl-experimental", "description": {"en": "Experimental ebuilds for Perl packages in Gentoo. Comments and\n bugreports are welcome!"}, "homepage": "https://cgit.gentoo.org/proj/perl-overlay.git/", "owner": [{"type": "project", "email": "perl@gentoo.org", "name": "Perl Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/perl-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/perl-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/perl-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/perl-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-08-26 10:49:03 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "perl-experimental-snapshots": {"quality": "experimental", "status": "unofficial", "name": "perl-experimental-snapshots", "description": {"en": "Unofficial mirror of overlay \"perl-experimental\" with metadata cache"}, "homepage": "https://github.com/gentoo-perl/perl-experimental-snapshots", "owner": [{"type": "person", "email": "kentnl@gentoo.org", "name": "Kent Fredric"}], "source": [{"type": "git", "uri": "https://github.com/gentoo-perl/perl-experimental-snapshots.git"}, {"type": "git", "uri": "git://github.com/gentoo-perl/perl-experimental-snapshots.git"}], "feed": ["https://github.com/gentoo-perl/perl-experimental-snapshots/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-26 11:01:24 +1200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 761}, "petkovich": {"quality": "experimental", "status": "unofficial", "name": "petkovich", "description": {"en": "Personal overlay of Jean-Christophe Petkovich"}, "homepage": "https://github.com/jcpetkovich/overlay-petkovich", "owner": [{"type": "person", "email": "jcpetkovich@gmail.com", "name": "Jean-Christophe Petkovich"}], "source": [{"type": "git", "uri": "https://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git://github.com/jcpetkovich/overlay-petkovich.git"}, {"type": "git", "uri": "git@github.com:jcpetkovich/overlay-petkovich.git"}], "feed": ["https://github.com/jcpetkovich/overlay-petkovich/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-21 16:21:04 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "pf4public": {"quality": "experimental", "status": "unofficial", "name": "pf4public", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/PF4Public/gentoo-overlay", "owner": [{"type": "person", "email": "PF4Public@mail.ru", "name": "PF4Public"}], "source": [{"type": "git", "uri": "https://github.com/PF4Public/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/PF4Public/gentoo-overlay.git"}], "feed": ["https://github.com/PF4Public/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 12:08:27 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 80}, "pg_overlay": {"quality": "experimental", "status": "unofficial", "name": "pg_overlay", "description": {"en": "User overlay"}, "homepage": "https://gitlab.com/Perfect_Gentleman/PG_Overlay", "owner": [{"type": "person", "email": "perfect007gentleman@gmail.com", "name": "Perfect Gentleman"}], "source": [{"type": "git", "uri": "https://gitlab.com/Perfect_Gentleman/PG_Overlay.git"}], "feed": ["https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 16:27:28 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 475}, "phackerlay": {"quality": "experimental", "status": "unofficial", "name": "phackerlay", "description": {"en": "Overlay for phackers"}, "homepage": "https://gitlab.phys-el.ru/ustinov/phackerlay", "owner": [{"type": "person", "email": "ustinov@phys-el.ru", "name": "Alexander B. Ustinov"}], "source": [{"type": "git", "uri": "https://gitlab.phys-el.ru/ustinov/phackerlay.git"}], "feed": ["https://gitlab.phys-el.ru/ustinov/phackerlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 10:25:57 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 43}, "phoenix591": {"quality": "experimental", "status": "unofficial", "name": "phoenix591", "description": {"en": "My personal overlay with a few random packages"}, "homepage": "https://github.com/Phoenix591/gentoo-overlay", "owner": [{"type": "person", "email": "kcelbert@gmail.com", "name": "Kyle Elbert"}], "source": [{"type": "git", "uri": "https://github.com/Phoenix591/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Phoenix591/gentoo-overlay.git"}], "feed": ["https://github.com/Phoenix591/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 06:54:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 53}, "pholthaus-overlay": {"quality": "experimental", "status": "unofficial", "name": "pholthaus-overlay", "description": {"en": "pholthaus' personal overlay"}, "homepage": "https://github.com/pholthau/pholthaus-overlay", "owner": [{"type": "person", "email": "patrick.holthaus@googlemail.com", "name": "Patrick Holthaus"}], "source": [{"type": "git", "uri": "https://github.com/pholthau/pholthaus-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/pholthau/pholthaus-overlay.git"}], "feed": ["https://github.com//pholthau/pholthaus-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-29 14:09:45 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pica-pica": {"quality": "experimental", "status": "unofficial", "name": "pica-pica", "description": {"en": "Pica Pica ebuilds"}, "homepage": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay", "owner": [{"type": "person", "email": "anton@picapica.im", "name": "Anton Sviridenko"}], "source": [{"type": "git", "uri": "https://github.com/antonsviridenko/pica-pica-gentoo-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-02-12 19:28:26 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "picarica-overlay": {"quality": "experimental", "status": "unofficial", "name": "picarica-overlay", "description": {"en": "Gentoo overlay for apps that dont exist or are unmaintaned"}, "homepage": "https://gitlab.com/picarica/picarica-overlay", "owner": [{"type": "person", "email": "dohaje@azet.sk", "name": "George Bucek"}], "source": [{"type": "git", "uri": "https://gitlab.com/picarica/picarica-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/picarica/picarica-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2020-03-21 15:52:44 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "pigfoot": {"quality": "experimental", "status": "unofficial", "name": "pigfoot", "description": {"en": "Ebuilds for experimental packages and chinese patches"}, "homepage": "https://cgit.gentoo.org/user/pigfoot.git/", "owner": [{"type": "person", "email": "pigfoot@gmail.com", "name": "pigfoot"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/pigfoot.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/pigfoot.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/pigfoot.git"}], "feed": ["https://cgit.gentoo.org/user/pigfoot.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-22 22:39:15 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "piniverlay": {"quality": "experimental", "status": "unofficial", "name": "piniverlay", "description": {"en": "Various packages and patches for developers"}, "homepage": "https://github.com/pinicarus/gentoo-overlay", "owner": [{"type": "person", "email": "pini@tuxfamily.org", "name": "Pierre-Nicolas Clauss"}], "source": [{"type": "git", "uri": "https://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/pinicarus/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:pinicarus/gentoo-overlay.git"}], "feed": ["https://github.com/pinicarus/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-20 12:26:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "pinkbyte": {"quality": "experimental", "status": "official", "name": "pinkbyte", "description": {"en": "Pinkbyte's developer overlay"}, "homepage": "https://github.com/Pinkbyte/pinkbyte-overlay", "owner": [{"type": "person", "email": "pinkbyte@gentoo.org", "name": "Sergey Popov"}], "source": [{"type": "git", "uri": "https://github.com/Pinkbyte/pinkbyte-overlay.git"}, {"type": "git", "uri": "git://github.com/Pinkbyte/pinkbyte-overlay.git"}], "feed": ["https://github.com/Pinkbyte/pinkbyte-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-12 15:50:52 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 27}, "pixlra": {"quality": "experimental", "status": "unofficial", "name": "pixlra", "description": {"en": "Pixlra collaborative overlay"}, "homepage": "https://cgit.gentoo.org/user/carreira.git/", "owner": [{"type": "person", "email": "jfmcarreira@gmail.com", "name": "Joao Carreira"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/carreira.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/carreira.git"}, {"type": "git", "uri": "https://github.com/pixlra/pixlra-gentoo-overlay.git"}], "feed": ["https://cgit.gentoo.org/user/carreira.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-25 13:29:50 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "pkalin": {"quality": "experimental", "status": "unofficial", "name": "pkalin", "description": {"en": "My Gentoo overlay, somewhat regularly maintained"}, "homepage": "https://github.com/thinrope/pkalin", "owner": [{"type": "person", "email": "kalin@ThinRope.net", "name": "Kalin KOZHUHAROV"}], "source": [{"type": "git", "uri": "https://github.com/thinrope/pkalin.git"}, {"type": "git", "uri": "git+ssh://git@github.com/thinrope/pkalin.git"}], "feed": ["https://github.com/thinrope/pkalin/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-25 00:08:43 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 93}, "plex-overlay": {"quality": "experimental", "status": "unofficial", "name": "plex-overlay", "description": {"en": "Personal overlay of comio containing Plex related ebuilds"}, "homepage": "https://github.com/comio/plex-overlay", "owner": [{"type": "person", "email": "luigi.mantellini@gmail.com", "name": "Luigi Mantellini"}], "source": [{"type": "git", "uri": "https://github.com/comio/plex-overlay.git"}], "feed": ["https://github.com/comio/plex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 09:28:36 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "poly-c": {"quality": "experimental", "status": "official", "name": "poly-c", "description": {"en": "Polynomial-C's overlay"}, "homepage": "http://www.gentoofan.org/gentoo/", "owner": [{"type": "person", "email": "polynomial-c@gentoo.org", "name": "Lars Wendler"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoofan.org/poly-c"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 20:05:02.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 296}, "powerman": {"quality": "experimental", "status": "unofficial", "name": "powerman", "description": {"en": "Overlay of Alex Efros"}, "homepage": "https://github.com/powerman/powerman-overlay", "owner": [{"type": "person", "email": "powerman-asdf@yandex.ru", "name": "Alex Efros"}], "source": [{"type": "git", "uri": "https://github.com/powerman/powerman-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 01:50:21 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 134}, "ppfeufer-gentoo-overlay": {"quality": "experimental", "status": "unofficial", "name": "ppfeufer-gentoo-overlay", "description": {"en": "ppfeufer's personal overlay."}, "homepage": "https://github.com/ppfeufer/gentoo-overlay", "owner": [{"type": "person", "email": "info@ppfeufer.de", "name": "Peter Pfeufer"}], "source": [{"type": "git", "uri": "https://github.com/ppfeufer/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ppfeufer/gentoo-overlay.git"}], "feed": ["https://github.com/ppfeufer/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 09:51:09 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "pross": {"quality": "experimental", "status": "unofficial", "name": "pross", "description": {"en": "Up to date ck-sources"}, "homepage": "https://github.com/Pross/pross-overlay", "owner": [{"type": "person", "email": "pross@pross.org.uk", "name": "Simon Prosser"}], "source": [{"type": "git", "uri": "https://github.com/Pross/pross-overlay.git"}], "feed": ["https://github.com/Pross/pross-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-05 01:00:12 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "pyfa": {"quality": "experimental", "status": "unofficial", "name": "pyfa", "description": {"en": "Newest versions of Pyfa (Python fitting assistant for EVE Online)"}, "homepage": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay", "owner": [{"type": "person", "email": "a.zuber@gmx.ch", "name": "Andreas Zuber"}], "source": [{"type": "git", "uri": "https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/ZeroPointEnergy/gentoo-pyfa-overlay.git"}], "feed": ["https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 08:45:53 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "python": {"quality": "experimental", "status": "official", "name": "python", "description": {"en": "Python project repository"}, "homepage": "https://cgit.gentoo.org/proj/python.git/", "owner": [{"type": "project", "email": "python@gentoo.org", "name": "Gentoo Python project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/python.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/python.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/python.git"}], "feed": ["https://cgit.gentoo.org/proj/python.git/atom/"], "x-state": "GOOD", "x-timestamp": "2019-12-29 12:56:32 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "qemu-init": {"quality": "experimental", "status": "official", "name": "qemu-init", "description": {"en": "qemu init script and tools"}, "homepage": "https://cgit.gentoo.org/dev/qiaomuf.git/", "owner": [{"type": "person", "email": "dolsen@gentoo.org", "name": "Brian Dolbec"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/kvm-tools.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/kvm-tools.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/kvm-tools.git"}], "feed": ["https://cgit.gentoo.org/proj/kvm-tools.git/atom/"], "x-state": "GOOD", "x-timestamp": "2016-03-23 10:53:56 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "qgp": {"quality": "experimental", "status": "unofficial", "name": "qgp", "description": {"en": "qgp overlay (mostly computing and HEP)"}, "homepage": "https://github.com/qgp/gentoo-qgp", "owner": [{"type": "person", "email": "qgp1024@gmail.com", "name": "Jochen Klein"}], "source": [{"type": "git", "uri": "https://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git://github.com/qgp/gentoo-qgp.git"}, {"type": "git", "uri": "git+ssh://git@github.com:qgp/gentoo-qgp.git"}], "feed": ["https://github.com/qgp/gentoo-qgp/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 11:14:15 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "qownnotes-overlay": {"quality": "experimental", "status": "unofficial", "name": "qownnotes-overlay", "description": {"en": "QOwnNotes overlay"}, "homepage": "http://www.qownnotes.org", "owner": [{"type": "person", "email": "patrizio@bekerle.com", "name": "Patrizio Bekerle"}], "source": [{"type": "git", "uri": "https://github.com/qownnotes/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qownnotes/gentoo-overlay.git"}], "feed": ["https://github.com/qownnotes/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 18:07:18 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 564}, "qsx": {"quality": "experimental", "status": "unofficial", "name": "qsx", "description": {"en": "qsx\u2019 ebuilds"}, "homepage": "https://github.com/qsuscs/gentoo-overlay", "owner": [{"type": "person", "email": "qsx@chaotikum.eu", "name": "Thomas Schneider"}], "source": [{"type": "git", "uri": "https://github.com/qsuscs/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/qsuscs/gentoo-overlay.git"}], "feed": ["https://github.com/qsuscs/gentoo-overlay/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 14:08:35 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "qt": {"quality": "experimental", "status": "official", "name": "qt", "description": {"en": "Official testing overlay for Qt and related packages, provided\n by Gentoo's Qt team. Contains ebuilds for Qt4 and Qt5 prereleases and live ebuilds,\n plus various (non-KDE) applications and utilities that use Qt."}, "homepage": "https://github.com/gentoo/qt", "owner": [{"type": "project", "email": "qt@gentoo.org", "name": "Qt Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/qt.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/qt.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/qt.git"}], "feed": ["https://cgit.gentoo.org/proj/qt.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-27 11:51:19 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "quarks": {"quality": "experimental", "status": "unofficial", "name": "quarks", "description": {"en": "Quarks's overlay; needful things around Security, Penetration Testing and gaming"}, "homepage": "https://git.zero-downtime.net/quark", "owner": [{"type": "person", "email": "it@startux.de", "name": "Stefan Reimer"}], "source": [{"type": "git", "uri": "https://git.zero-downtime.net/quark/quarks.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-19 15:35:17 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 35}, "rafaelmartins": {"quality": "experimental", "status": "official", "name": "rafaelmartins", "description": {"en": "Rafael Martins' Gentoo overlay"}, "homepage": "https://github.com/rafaelmartins/gentoo-overlay", "owner": [{"type": "person", "email": "rafaelmartins@gentoo.org", "name": "Rafael G. Martins"}], "source": [{"type": "git", "uri": "https://github.com/rafaelmartins/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/rafaelmartins/gentoo-overlay.git"}], "feed": ["https://github.com/rafaelmartins/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2015-10-19 20:09:06 -0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "rage": {"quality": "experimental", "status": "unofficial", "name": "rage", "description": {"en": "rage's personal overlay"}, "homepage": "https://gitlab.com/oxr463/overlay", "owner": [{"type": "person", "email": "ramage.lucas@protonmail.com", "name": "Lucas Ramage"}], "source": [{"type": "git", "uri": "https://gitlab.com/oxr463/overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/oxr463/overlay.git"}], "feed": ["https://gitlab.com/oxr463/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-06-24 07:51:33 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 47}, "raiagent": {"quality": "experimental", "status": "unofficial", "name": "raiagent", "description": {"en": "Well-documented ebuilds en-route to a bandersnatch near you"}, "homepage": "https://github.com/leycec/raiagent", "owner": [{"type": "person", "email": "leycec@gmail.com", "name": "Cecil Curry"}], "source": [{"type": "git", "uri": "https://github.com/leycec/raiagent"}, {"type": "git", "uri": "git://github.com/leycec/raiagent.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-19 03:04:49 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 105}, "rasdark": {"quality": "experimental", "status": "unofficial", "name": "rasdark", "description": {"en": "rasdark personal overlay"}, "homepage": "https://github.com/rasdark/overlay", "owner": [{"type": "person", "email": "andrew.senik@gmail.com", "name": "Andrey Senik"}], "source": [{"type": "git", "uri": "https://github.com/rasdark/overlay"}, {"type": "git", "uri": "git://github.com/rasdark/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-24 08:56:38 +0300\n", "x-openpgp-signed": "N", "x-masters": ["calculate", "gentoo"], "x-ebuild-count": 51}, "raw": {"quality": "experimental", "status": "unofficial", "name": "raw", "description": {"en": "some raw stuff"}, "homepage": "https://github.com/mahatma-kaganovich/raw", "owner": [{"type": "person", "email": "mahatma@eu.by", "name": "Denis Kaganovich (aka Dzianis Kahanovich)"}], "source": [{"type": "git", "uri": "https://github.com/mahatma-kaganovich/raw.git"}], "feed": ["https://github.com/mahatma-kaganovich/raw/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 13:01:30 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "rdnetto-overlay": {"quality": "experimental", "status": "unofficial", "name": "rdnetto-overlay", "description": {"en": "Personal Overlay"}, "homepage": "https://github.com/rdnetto/rdnetto-overlay", "owner": [{"type": "person", "email": "rdnetto@gmail.com", "name": "Reuben D'Netto"}], "source": [{"type": "git", "uri": "https://github.com/rdnetto/rdnetto-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:rdnetto/rdnetto-overlay.git"}], "feed": ["https://github.com/rdnetto/rdnetto-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-04 12:01:09 +1100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 89}, "reagentoo": {"quality": "experimental", "status": "unofficial", "name": "reagentoo", "description": {"en": "reagentoo's overlay"}, "homepage": "https://gitlab.com/reagentoo/gentoo-overlay", "owner": [{"type": "person", "email": "reagentoo@gmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/reagentoo/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/reagentoo/gentoo-overlay.git"}], "feed": ["https://gitlab.com/reagentoo/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 18:32:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 85}, "ricerlay": {"quality": "experimental", "status": "unofficial", "name": "ricerlay", "description": {"en": "Overlay for ricing enthusiasts"}, "homepage": "https://github.com/azahi/ricerlay", "owner": [{"type": "person", "email": "azahi@teknik.io", "name": "azahi"}], "source": [{"type": "git", "uri": "https://github.com/azahi/ricerlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/azahi/ricerlay.git"}], "feed": ["https://github.com/azahi/ricerlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 18:08:49 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 94}, "rich0": {"quality": "experimental", "status": "official", "name": "rich0", "description": {"en": "Rich0's developer overlay"}, "homepage": "https://github.com/rich0/rich0-overlay", "owner": [{"type": "person", "email": "rich0@gentoo.org", "name": "Richard Freeman"}], "source": [{"type": "git", "uri": "git://github.com/rich0/rich0-overlay.git"}], "feed": ["https://github.com/rich0/rich0-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-24 21:06:51 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 48}, "ring-overlay": {"quality": "experimental", "status": "unofficial", "name": "ring-overlay", "description": {"en": "Ring is free software for universal communication which respects freedoms and privacy of its users."}, "homepage": "https://github.com/stefan-langenmaier/ring-overlay", "owner": [{"type": "person", "email": "stefan.langenmaier+gentoo@gmail.com", "name": "Stefan Langenmaier"}], "source": [{"type": "git", "uri": "https://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git://github.com/stefan-langenmaier/ring-overlay.git"}, {"type": "git", "uri": "git@github.com:stefan-langenmaier/ring-overlay.git"}], "feed": ["https://github.com/stefan-langenmaier/ring-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-04-17 10:23:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "rion": {"quality": "experimental", "status": "unofficial", "name": "rion", "description": {"en": "Russian overlay with a some patched and specific\n software"}, "homepage": "https://github.com/rion-overlay", "owner": [{"type": "person", "email": "rion4ik@gmail.com", "name": "Sergey Ilinykh"}], "source": [{"type": "git", "uri": "https://github.com/rion-overlay/rion-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/rion-overlay/rion-overlay.git"}], "feed": ["https://github.com/rion-overlay/rion-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-20 14:18:19 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 102}, "riru": {"quality": "experimental", "status": "unofficial", "name": "riru", "description": {"en": "Home overlay for development, patches and live ebuilds", "ru": "\u0414\u043e\u043c\u0430\u0448\u043d\u0438\u0439 \u043e\u0432\u0435\u0440\u043b\u0435\u0439 \u0434\u043b\u044f \u0440\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0438, \u043f\u0430\u0442\u0447\u0435\u0439 \u0438 \u043b\u0430\u0439\u0432 \u0435\u0431\u0438\u043b\u0434\u043e\u0432"}, "homepage": "https://github.com/pkulev/riru", "owner": [{"type": "person", "email": "kulyov.pavel@gmail.com", "name": "Pavel Kulyov"}], "source": [{"type": "git", "uri": "https://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git://github.com/pkulev/riru.git"}, {"type": "git", "uri": "git@github.com:pkulev/riru.git"}], "feed": ["https://github.com/pkulev/riru/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 10:05:17 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "robert7k": {"quality": "experimental", "status": "unofficial", "name": "robert7k", "description": {"en": "personal overlay of robert7k"}, "homepage": "https://github.com/robert7k/gentoo-overlay", "owner": [{"type": "person", "email": "gentoo.2019@r123.de"}], "source": [{"type": "git", "uri": "https://github.com/robert7k/gentoo-overlay.git"}], "feed": ["https://github.com/robert7k/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 22:21:58 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 38}, "robertgzr": {"quality": "experimental", "status": "unofficial", "name": "robertgzr", "description": {"en": "robertgzr's personal overlay."}, "homepage": "https://git.sr.ht/~robertgzr/portage", "owner": [{"type": "person", "email": "robert@gnzler.io", "name": "Robert G\u00fcnzler"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~robertgzr/portage"}, {"type": "git", "uri": "ssh://git@git.sr.ht:~robertgzr/portage"}], "feed": ["https://git.sr.ht/~robertgzr/portage/log/rss.xml"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-12 12:51:42 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 64}, "roslin": {"quality": "experimental", "status": "unofficial", "name": "roslin", "description": {"en": "This is roslin, my small overlay. Enjoy! (:"}, "homepage": "https://gitlab.com/roslin-uberlay/roslin", "owner": [{"type": "person", "email": "szarpaj@grubelek.pl", "name": "Piotr Szymaniak"}, {"type": "person", "email": "mziab@o2.pl", "name": "Micha\u0142 Zi\u0105bkowski"}], "source": [{"type": "git", "uri": "https://gitlab.com/roslin-uberlay/roslin.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-05 09:20:02 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "rpm": {"quality": "experimental", "status": "unofficial", "name": "rpm", "description": {"en": "Overlay for RPM packagers targeting Fedora, EPEL, CentOS and similar distros"}, "homepage": "https://github.com/pavlix/gentoo-rpm", "owner": [{"type": "person", "email": "pavlix@pavlix.net", "name": "Pavel \u0160imerda"}], "source": [{"type": "git", "uri": "https://github.com/pavlix/gentoo-rpm.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2017-02-16 11:49:24 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "ruby": {"quality": "experimental", "status": "official", "name": "ruby", "description": {"en": "Experimental ebuilds from the Ruby edge."}, "homepage": "https://cgit.gentoo.org/proj/ruby", "owner": [{"type": "project", "email": "ruby@gentoo.org", "name": "Ruby Team"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/ruby-overlay.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/ruby-overlay.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/ruby-overlay.git"}], "feed": ["https://cgit.gentoo.org/proj/ruby-overlay.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-09-15 09:39:31 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "rukruk": {"quality": "experimental", "status": "unofficial", "name": "rukruk", "description": {"en": "some packages not found in other overlays, for issues create ticket in github"}, "homepage": "https://github.com/Atoms/rukruk", "owner": [{"type": "person", "email": "atoms@tups.lv", "name": "Aivars Sterns"}], "source": [{"type": "git", "uri": "https://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git://github.com/Atoms/rukruk.git"}, {"type": "git", "uri": "git@github.com:Atoms/rukruk.git"}], "feed": ["https://github.com/Atoms/rukruk/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2019-04-05 10:07:56 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 20}, "rust": {"quality": "experimental", "status": "unofficial", "name": "rust", "description": {"en": "rust modules and tools"}, "homepage": "https://github.com/gentoo/gentoo-rust", "owner": [{"type": "project", "email": "rust@gentoo.org", "name": "Rust Team"}], "source": [{"type": "git", "uri": "https://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git://github.com/gentoo/gentoo-rust.git"}, {"type": "git", "uri": "git@github.com:gentoo/gentoo-rust.git"}], "feed": ["https://github.com/gentoo/gentoo-rust/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-09 15:21:38 +0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 55}, "ryans": {"quality": "experimental", "status": "unofficial", "name": "ryans", "description": {"en": "Personal ebuild repository."}, "homepage": "https://github.com/bekcpear/ryans-repos", "owner": [{"type": "person", "email": "i@bitbili.net", "name": "Ryan Qian"}], "source": [{"type": "git", "uri": "https://github.com/bekcpear/ryans-repos.git"}, {"type": "git", "uri": "git@github.com:bekcpear/ryans-repos.git"}], "feed": ["https://github.com/bekcpear/ryans-repos/commits/main.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 15:33:17 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sabayon": {"quality": "experimental", "status": "unofficial", "name": "sabayon", "description": {"en": "Sabayon ebuilds that could be upstreamed to\n Gentoo (or just being useful for Gentoo users as well):\n hot fixes, ebuild updates, etc.\n For Sabayon-only ebuilds, please use the sabayon-distro overlay.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/for-gentoo.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/for-gentoo/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-19 23:00:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 150}, "sabayon-distro": {"quality": "experimental", "status": "unofficial", "name": "sabayon-distro", "description": {"en": "Sabayon related ebuilds such as artwork, kernel binaries,\n split packages, etc.\n Bugs to http://bugs.sabayon.org"}, "homepage": "http://sabayon.org", "owner": [{"type": "person", "email": "joost.ruis@sabayonlinux.org"}], "source": [{"type": "git", "uri": "git://github.com/Sabayon/sabayon-distro.git"}], "feed": ["https://github.com/feeds/Sabayon/commits/sabayon-distro/master"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-29 23:19:56 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 513}, "sage-on-gentoo": {"quality": "experimental", "status": "unofficial", "name": "sage-on-gentoo", "description": {"en": "Split ebuilds for the Sage computer algebra system"}, "homepage": "https://github.com/cschwan/sage-on-gentoo", "owner": [{"type": "person", "email": "frp.bissey@gmail.com", "name": "Francois Bissey"}], "source": [{"type": "git", "uri": "git://github.com/cschwan/sage-on-gentoo.git"}, {"type": "git", "uri": "https://github.com/cschwan/sage-on-gentoo.git"}], "feed": ["https://github.com/feeds/cschwan/commits/sage-on-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-25 14:01:09 +1300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 265}, "salfter": {"quality": "experimental", "status": "unofficial", "name": "salfter", "description": {"en": "Scott Alfter's ebuilds"}, "homepage": "https://gitlab.com/salfter/portage", "owner": [{"type": "person", "email": "scott@alfter.us", "name": "Scott Alfter"}], "source": [{"type": "git", "uri": "https://gitlab.com/salfter/portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:44:46 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 151}, "sam_c": {"quality": "experimental", "status": "unofficial", "name": "sam_c", "description": {"en": "sam_c's personal overlay"}, "homepage": "https://github.com/thesamesam/overlay", "owner": [{"type": "person", "email": "sam@cmpct.info", "name": "Sam James"}], "source": [{"type": "git", "uri": "https://github.com/thesamesam/overlay"}, {"type": "git", "uri": "git+ssh://git@github.com/thesamesam/overlay.git"}], "feed": ["https://github.com/thesamesam/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 15:32:48 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sarnex-overlay": {"quality": "experimental", "status": "unofficial", "name": "sarnex-overlay", "description": {"en": "Sarnex's personal overlay"}, "homepage": "https://github.com/sarnex/sarnex-overlay.git", "owner": [{"type": "person", "email": "commendsarnex@gmail.com", "name": "Nick Sarnie"}], "source": [{"type": "git", "uri": "https://github.com/sarnex/sarnex-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sarnex/sarnex-overlay.git"}], "feed": ["https://github.com/sarnex/sarnex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-10-01 00:04:35 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sattvik": {"quality": "experimental", "status": "unofficial", "name": "sattvik", "description": {"en": "sattvik's overlay with personalized bug fixes and tweaks"}, "homepage": "https://cgit.gentoo.org/user/sattvik.git/", "owner": [{"type": "person", "email": "gentoo@sattvik.com", "name": "Daniel Solano Gomez"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/sattvik.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/sattvik.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/sattvik.git"}], "feed": ["https://cgit.gentoo.org/user/sattvik.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-04 18:47:35 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 32}, "science": {"quality": "experimental", "status": "official", "name": "science", "description": {"en": "The Gentoo Science Overlay is intended as a place to work\n outside of the main portage tree on experimental ebuilds. Our aim is to\n increase the rate of development of scientific packages for Gentoo, but\n ebuilds in this repository are by their very nature more experimental. If\n you wish to use them you should be willing to help test and report\n bugs. For contribution read https://wiki.gentoo.org/wiki/Project:Science/Contributing\n "}, "homepage": "https://wiki.gentoo.org/wiki/Project:Science", "owner": [{"type": "project", "email": "sci@gentoo.org", "name": "sci"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/sci.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/sci.git"}, {"type": "git", "uri": "https://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git://github.com/gentoo-science/sci.git"}, {"type": "git", "uri": "git@github.com:gentoo-science/sci.git"}], "feed": ["https://cgit.gentoo.org/proj/sci.git/atom/", "https://github.com/gentoo-science/sci/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 13:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 723}, "scrill": {"quality": "experimental", "status": "unofficial", "name": "scrill", "description": {"en": "Some admin tools"}, "homepage": "https://github.com/scrill/scrill-overlay", "owner": [{"type": "person", "email": "sergey.zhuga@gmail.com", "name": "Sergey Zhuga"}], "source": [{"type": "git", "uri": "git://github.com/scrill/scrill-overlay.git"}], "feed": ["https://github.com/scrill/scrill-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-06-26 15:18:11 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "seden": {"quality": "experimental", "status": "unofficial", "name": "seden", "description": {"en": "Experimental ebuilds that are still unmaintained"}, "homepage": "https://cgit.gentoo.org/user/seden.git/", "owner": [{"type": "person", "email": "yamakuzure@gmx.net", "name": "Sven Eden"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/seden.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/seden.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/seden.git"}], "feed": ["https://cgit.gentoo.org/user/seden.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-25 17:13:52 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 29}, "setkeh": {"quality": "experimental", "status": "unofficial", "name": "setkeh", "description": {"en": "setkeh maintained ebuilds"}, "homepage": "https://github.com/setkeh/Portage-Overlay", "owner": [{"type": "person", "email": "setkeh@gmail.com", "name": "James (setkeh) Griffis"}], "source": [{"type": "git", "uri": "https://github.com/setkeh/Portage-Overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:setkeh/Portage-Overlay.git"}], "feed": ["https://github.com/setkeh/Portage-Overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-05-19 14:57:04 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sevcsik": {"quality": "experimental", "status": "unofficial", "name": "sevcsik", "description": {"en": "Mainly cryptocurrency/blockchain related ebuilds"}, "homepage": "https://github.com/sevcsik/overlay", "owner": [{"type": "person", "email": "sevcsik@sevdev.hu", "name": "Andras Sevcsik"}], "source": [{"type": "git", "uri": "https://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git://github.com/sevcsik/overlay.git"}, {"type": "git", "uri": "git@github.com:sevcsik/overlay.git"}], "feed": ["https://github.com/sevcsik/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-08-29 00:43:36 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sft": {"quality": "experimental", "status": "unofficial", "name": "sft", "description": {"en": "SFT Technologies gentoo overlay"}, "homepage": "https://github.com/SFTtech/gentoo-overlay", "owner": [{"type": "person", "email": "jj@stusta.net", "name": "Jonas Jelten"}], "source": [{"type": "git", "uri": "https://github.com/SFTtech/gentoo-overlay.git"}], "feed": ["https://github.com/SFTtech/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-17 20:14:57 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "sgs": {"quality": "experimental", "status": "unofficial", "name": "sgs", "description": {"en": "Simeon Simeonov's personal Gentoo overlay"}, "homepage": "https://github.com/blackm0re/sgs-overlay", "owner": [{"type": "person", "email": "sgs@pichove.org", "name": "Simeon Simeonov"}], "source": [{"type": "git", "uri": "https://github.com/blackm0re/sgs-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:blackm0re/sgs-overlay.git"}], "feed": ["https://github.com/blackm0re/sgs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-29 13:56:15 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "shnurise": {"quality": "experimental", "status": "unofficial", "name": "shnurise", "description": {"en": "packages for mono environment and other", "ru": "\u043f\u0430\u043a\u0435\u0442\u044b \u0434\u043b\u044f \u043c\u043e\u043d\u043e \u0438 \u0440\u0430\u0437\u043d\u043e\u0435 \u043f\u0440\u043e\u0447\u0435\u0435"}, "homepage": "https://github.com/ArsenShnurkov/shnurise", "owner": [{"type": "person", "email": "Arsen.Shnurkov@gmail.com", "name": "Arsen Shnurkov"}], "source": [{"type": "git", "uri": "https://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git://github.com/ArsenShnurkov/shnurise.git"}, {"type": "git", "uri": "git@github.com:ArsenShnurkov/shnurise.git"}], "feed": ["https://github.com/ArsenShnurkov/shnurise/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-02-07 13:09:42 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 40}, "sihnon": {"quality": "experimental", "status": "unofficial", "name": "sihnon", "description": {"en": "optiz0r's sihnon overlay"}, "homepage": "https://github.com/optiz0r/gentoo-overlay", "owner": [{"type": "person", "email": "optiz0r@gmail.com", "name": "optiz0r"}], "source": [{"type": "git", "uri": "https://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/optiz0r/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:optiz0r/gentoo-overlay.git"}], "feed": ["https://github.com/optiz0r/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-19 17:55:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "simonvanderveldt": {"quality": "experimental", "status": "unofficial", "name": "simonvanderveldt", "description": {"en": "Personal Gentoo overlay focused on music production and engineering applications"}, "homepage": "https://github.com/simonvanderveldt/simonvanderveldt-overlay", "owner": [{"type": "person", "email": "simon.vanderveldt@gmail.com", "name": "Simon van der Veldt"}], "source": [{"type": "git", "uri": "https://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git://github.com/simonvanderveldt/simonvanderveldt-overlay.git"}, {"type": "git", "uri": "git@github.com:simonvanderveldt/simonvanderveldt-overlay.git"}], "feed": ["https://github.com/simonvanderveldt/simonvanderveldt-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 15:36:27 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "sinustrom": {"quality": "experimental", "status": "unofficial", "name": "sinustrom", "description": {"en": "Sinustrom Gentoo Overlay"}, "homepage": "https://github.com/zpuskas/sinustrom-gentoo-overlay", "owner": [{"type": "person", "email": "zoltan@sinustrom.info", "name": "Zoltan Puskas"}], "source": [{"type": "git", "uri": "https://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/zpuskas/sinustrom-gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:zpuskas/sinustrom-gentoo-overlay.git"}], "feed": ["https://github.com/zpuskas/sinustrom-gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-13 13:14:52 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "sk-overlay": {"quality": "experimental", "status": "unofficial", "name": "sk-overlay", "description": {"en": "The Scriptkitties overlay for additional ebuilds"}, "homepage": "https://github.com/scriptkitties/overlay", "owner": [{"type": "person", "email": "p.spek@tyil.work", "name": "Patrick Spek"}], "source": [{"type": "git", "uri": "https://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git://github.com/scriptkitties/overlay.git"}, {"type": "git", "uri": "git@github.com:scriptkitties/overlay.git"}], "feed": ["https://github.com/scriptkitties/overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-07 20:27:46 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 52}, "slonko": {"quality": "experimental", "status": "unofficial", "name": "slonko", "description": {"en": "Personal portage overlay"}, "homepage": "https://slonko.net/portage", "owner": [{"type": "person", "email": "marcin.deranek@slonko.net", "name": "Marcin Deranek"}], "source": [{"type": "git", "uri": "https://slonko.net/git/portage"}], "feed": ["https://slonko.net/git/portage/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 21:41:09 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "slyfox": {"quality": "experimental", "status": "official", "name": "slyfox", "description": {"en": "slyfox's ebuild den"}, "homepage": "https://github.com/trofi/slyfox-gentoo", "owner": [{"type": "person", "email": "slyfox@gentoo.org", "name": "Sergei Trofimovich"}], "source": [{"type": "git", "uri": "https://github.com/trofi/slyfox-gentoo"}], "feed": ["https://github.com/trofi/slyfox-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-11 10:10:56 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 18}, "smaeul": {"quality": "experimental", "status": "unofficial", "name": "smaeul", "description": {"en": "Personal overlay, mainly packages patched for musl compatibility"}, "homepage": "https://github.com/smaeul/portage-overlay", "owner": [{"type": "person", "email": "samuel@sholland.org", "name": "Samuel Holland"}], "source": [{"type": "git", "uri": "https://github.com/smaeul/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/smaeul/portage-overlay.git"}], "feed": ["https://github.com/smaeul/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-19 21:29:49 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 19}, "snapd": {"quality": "experimental", "status": "unofficial", "name": "snapd", "description": {"en": "ebuilds for canaonicals snapd"}, "homepage": "https://github.com/zigford/snapd", "owner": [{"type": "person", "email": "zigford@gmail.com", "name": "Jesse Harris"}], "source": [{"type": "git", "uri": "https://github.com/zigford/snapd.git"}], "feed": ["https://github.com/zigford/snapd/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-31 14:42:39 +1000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "sogo-connector": {"quality": "experimental", "status": "unofficial", "name": "sogo-connector", "description": {"en": "SOGO connector overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/sogo-connector.git/", "owner": [{"type": "person", "email": "gentoo@posteo.de", "name": "Fabian K\u00f6ster"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/sogo-connector.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/sogo-connector.git"}], "feed": ["https://cgit.gentoo.org/repo/user/sogo-connector.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-04-02 11:14:25 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "soltys": {"quality": "experimental", "status": "unofficial", "name": "soltys", "description": {"en": "tools usefull on CTFs and things that aren't in the portage tristelune"}, "homepage": "https://github.com/soltysek/soltys-overlay", "owner": [{"type": "person", "email": "bgo@soltys.info", "name": "Krzysztof Koro\u015bcik"}], "source": [{"type": "git", "uri": "https://github.com/soltysek/soltys-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/soltysek/soltys-overlay.git"}], "feed": ["https://github.com/soltysek/soltys-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 19:09:18 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 30}, "sorinp": {"quality": "experimental", "status": "unofficial", "name": "sorinp", "description": {"en": "A collection of ebuilds that are missing or outdated or incomplete on the Gentoo portage official repository.."}, "homepage": "https://github.com/psihozefir/sorinp-gentoo-overlay", "owner": [{"type": "person", "email": "sorin.panca@gmail.com", "name": "Sorin Panca"}], "source": [{"type": "git", "uri": "https://github.com/psihozefir/sorinp-gentoo-overlay"}], "x-state": "GOOD", "x-timestamp": "2016-11-20 14:11:02 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "sorrow": {"quality": "experimental", "status": "unofficial", "name": "sorrow", "description": {"en": "Ebuilds for some wayland-related software and some other stuff"}, "homepage": "https://gitlab.com/eternal-sorrow/gentoo-local", "owner": [{"type": "person", "email": "sergamena@inbox.ru", "name": "sorrow"}], "source": [{"type": "git", "uri": "https://gitlab.com/eternal-sorrow/gentoo-local.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com:eternal-sorrow/gentoo-local.git"}], "feed": ["https://gitlab.com/eternal-sorrow/gentoo-local/commits/master?format=atom"], "x-state": "GOOD", "x-timestamp": "2021-03-03 15:58:12 +1000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 16}, "spikyatlinux": {"quality": "experimental", "status": "unofficial", "name": "spikyatlinux", "description": {"en": "Here are some of my own or modified ebuilds. Also some of them I've found in the web."}, "homepage": "https://github.com/spikyatlinux/ebuilds_for_gentoo", "owner": [{"type": "person", "email": "spikyatlinux@gmail.com", "name": "SpikyAtLinux"}], "source": [{"type": "git", "uri": "https://github.com/spikyatlinux/ebuilds_for_gentoo.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 12:01:41 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "sping": {"quality": "experimental", "status": "official", "name": "sping", "description": {"en": "Overlay of Gentoo developer Sebastian Pipping; for issues, please open tickets at GitHub"}, "homepage": "https://github.com/hartwork/gentoo-overlay-sping", "owner": [{"type": "person", "email": "sping@gentoo.org", "name": "Sebastian Pipping"}], "source": [{"type": "git", "uri": "https://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git://github.com/hartwork/gentoo-overlay-sping.git"}, {"type": "git", "uri": "git@github.com:hartwork/gentoo-overlay-sping.git"}], "feed": ["https://github.com/hartwork/gentoo-overlay-sping/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-04 19:49:25 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "squeezebox": {"quality": "experimental", "status": "unofficial", "name": "squeezebox", "description": {"en": "Packages for the Squeezebox network audio player from Logitech"}, "homepage": "https://cgit.gentoo.org/user/squeezebox.git/", "owner": [{"type": "person", "email": "stuart@hickinbottom.com", "name": "Stuart Hickinbottom"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/squeezebox.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/squeezebox.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/squeezebox.git"}], "feed": ["https://cgit.gentoo.org/user/squeezebox.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-27 10:50:29 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 14}, "src_prepare-overlay": {"quality": "experimental", "status": "unofficial", "name": "src_prepare-overlay", "description": {"en": "src_prepare group's Gentoo overlay"}, "homepage": "https://gitlab.com/src_prepare/src_prepare-overlay.git", "owner": [{"type": "person", "name": "XGQT", "email": "xgqt@protonmail.com"}], "source": [{"type": "git", "uri": "https://gitlab.com/src_prepare/src_prepare-overlay.git"}, {"type": "git", "uri": "git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git"}], "feed": ["https://gitlab.com/src_prepare/src_prepare-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:17:16 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 231}, "ssnb": {"quality": "experimental", "status": "unofficial", "name": "ssnb", "description": {"en": "Gentoo repository made by ssnb"}, "homepage": "https://cgit.gentoo.org/repo/user/ssnb.git/", "owner": [{"type": "person", "email": "samuelbernardo.mail@gmail.com", "name": "Samuel Bernardo"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/ssnb.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/ssnb"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/ssnb.git"}], "feed": ["https://cgit.gentoo.org/repo/user/ssnb.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-08 00:31:07 +0000\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 330}, "sspreitz": {"quality": "experimental", "status": "unofficial", "name": "sspreitz", "description": {"en": "My Gentoo repository and ebuilds"}, "homepage": "https://github.com/sspreitzer/gentoo-repo", "owner": [{"type": "person", "email": "sspreitz@redhat.com", "name": "Sascha Spreitzer"}], "source": [{"type": "git", "uri": "https://github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/sspreitzer/gentoo-repo.git"}, {"type": "git", "uri": "git@github.com:sspreitzer/gentoo-repo.git"}], "feed": ["https://github.com/sspreitzer/gentoo-repo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-09-24 10:35:30 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "steam-overlay": {"quality": "experimental", "status": "unofficial", "name": "steam-overlay", "description": {"en": "Gentoo overlay for Valve's Steam client and Steam-based games"}, "homepage": "https://github.com/anyc/steam-overlay", "owner": [{"type": "person", "email": "dev@kicherer.org", "name": "Mario Kicherer"}], "source": [{"type": "git", "uri": "https://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git://github.com/anyc/steam-overlay.git"}, {"type": "git", "uri": "git@github.com:anyc/steam-overlay.git"}], "feed": ["https://github.com/anyc/steam-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-22 10:25:35 +0000\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "stefantalpalaru": {"quality": "experimental", "status": "unofficial", "name": "stefantalpalaru", "description": {"en": "Gentoo overlay with ebuilds by Stefan Talpalaru that are not in the tree"}, "homepage": "https://github.com/stefantalpalaru/gentoo-overlay", "owner": [{"type": "person", "email": "stefantalpalaru@yahoo.com", "name": "Stefan Talpalaru"}], "source": [{"type": "git", "uri": "https://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/stefantalpalaru/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:stefantalpalaru/gentoo-overlay.git"}], "feed": ["https://github.com/stefantalpalaru/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-30 03:57:15 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 968}, "stha09": {"quality": "experimental", "status": "unofficial", "name": "stha09", "description": {"en": "stha09's personal overlay"}, "homepage": "https://github.com/stha09/gpo-stha09", "owner": [{"type": "person", "email": "sultan@gentoo.org", "name": "Stephan Hartmann"}], "source": [{"type": "git", "uri": "https://github.com/stha09/gpo-stha09.git"}, {"type": "git", "uri": "git://github.com:stha09/gpo-stha09.git"}, {"type": "git", "uri": "git@github.com:stha09/gpo-stha09.git"}], "feed": ["https://github.com/stha09/gpo-stha09/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 22:33:57 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "stowe-verlay": {"quality": "experimental", "status": "unofficial", "name": "stowe-verlay", "description": {"en": "Few things that have either broken elsewhere or fallen unmaintained, such as winexe, a source-based version of logitech media server, a patched version of dansguardian"}, "homepage": "https://github.com/mwstowe/stowe-verlay", "owner": [{"type": "person", "email": "mstowe@chicago.us.mensa.org", "name": "Michael Stowe"}], "source": [{"type": "git", "uri": "https://github.com/mwstowe/stowe-verlay.git"}], "feed": ["https://github.com/mwstowe/stowe-verlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-21 08:51:06 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 34}, "strohel": {"quality": "experimental", "status": "unofficial", "name": "strohel", "description": {"en": "strohel's overlay"}, "homepage": "https://github.com/strohel/strohel-overlay", "owner": [{"type": "person", "email": "matej@laitl.cz", "name": "Mat\u011bj Laitl"}], "source": [{"type": "git", "uri": "https://strohel@github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git://github.com/strohel/strohel-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:strohel/strohel-overlay.git"}], "feed": ["https://github.com/strohel/strohel-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-02-15 11:27:29 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "stuff": {"quality": "experimental", "status": "unofficial", "name": "stuff", "description": {"en": "stuff"}, "homepage": "https://github.com/istitov/stuff", "owner": [{"type": "person", "email": "iohann.s.titov@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/istitov/stuff.git"}], "feed": ["https://github.com/istitov/stuff/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-01 17:05:28 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 285}, "superposition": {"quality": "experimental", "status": "unofficial", "name": "superposition", "description": {"en": "Phil's overlay"}, "homepage": "https://cgit.gentoo.org/repo/user/superposition.git/", "owner": [{"type": "person", "email": "Phil_miess@yahoo.com", "name": "Philip Miess"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/user/superposition.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/user/superposition.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/user/superposition.git"}], "feed": ["https://cgit.gentoo.org/repo/user/superposition.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-10 17:58:16 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 57}, "swegener": {"quality": "experimental", "status": "official", "name": "swegener", "description": {"en": "This overlay contains some experimental stuff, but mostly\n stuff I quickly wrote an ebuild for or grabed it from bugzilla and did not\n have the time to commit it to the official tree or do not consider it ready\n for it."}, "homepage": "https://dev.gentoo.org/~swegener/", "owner": [{"type": "person", "email": "swegener@gentoo.org"}], "source": [{"type": "rsync", "uri": "rsync://rsync.gentoo.stealer.net/swegener-overlay/"}], "x-state": "GOOD", "x-timestamp": "2020-10-24 13:35:01.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 33}, "tabinol": {"quality": "experimental", "status": "unofficial", "name": "tabinol", "description": {"en": "Tabinol personal overlay with no special focus"}, "homepage": "https://github.com/Tabinol/tabinol-overlay", "owner": [{"type": "person", "email": "mblanchet@fastmail.com", "name": "Michel Blanchet"}], "source": [{"type": "git", "uri": "https://github.com/Tabinol/tabinol-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tabinol/tabinol-overlay.git"}], "feed": ["https://github.com/Tabinol/tabinol-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2019-02-25 22:30:56 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tamiko": {"quality": "experimental", "status": "unofficial", "name": "tamiko", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/tamiko.git/", "owner": [{"type": "person", "email": "tamiko@gentoo.org", "name": "Matthias Maier"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/tamiko.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/tamiko.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/tamiko.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/tamiko.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-03-26 20:30:21 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "tante": {"quality": "experimental", "status": "unofficial", "name": "tante", "description": {"en": "Overlay of tante"}, "homepage": "https://github.com/tante/overlay", "owner": [{"type": "person", "email": "tante@tante.cc"}], "source": [{"type": "git", "uri": "https://github.com/tante/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2017-02-26 14:13:35 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "tarantool": {"quality": "experimental", "status": "unofficial", "name": "tarantool", "description": {"en": "Tarantool Gentoo Overlay"}, "homepage": "https://github.com/tarantool/gentoo-overlay", "owner": [{"type": "person", "email": "totktonada.ru@gmail.com", "name": "Alexander Turenko"}], "source": [{"type": "git", "uri": "https://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git://github.com/tarantool/gentoo-overlay.git"}, {"type": "git", "uri": "git@github.com:tarantool/gentoo-overlay.git"}], "feed": ["https://github.com/tarantool/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-04 03:36:05 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 56}, "tastytea": {"quality": "experimental", "status": "unofficial", "name": "tastytea", "description": {"en": "Overlay of tastytea"}, "homepage": "https://schlomp.space/tastytea/overlay", "owner": [{"type": "person", "email": "gentoo@tastytea.de", "name": "tastytea"}], "source": [{"type": "git", "uri": "https://schlomp.space/tastytea/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 13:57:40 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 39}, "tatsh-overlay": {"quality": "experimental", "status": "unofficial", "name": "tatsh-overlay", "description": {"en": "Overlay from Tatsh - emulators/fonts/game/misc"}, "homepage": "https://github.com/Tatsh/tatsh-overlay", "owner": [{"type": "person", "email": "audvare+overlay@gmail.com", "name": "Andrew Udvare"}], "source": [{"type": "git", "uri": "https://github.com/Tatsh/tatsh-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Tatsh/tatsh-overlay.git"}], "feed": ["https://github.com/Tatsh/tatsh-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-31 00:39:45 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 86}, "telans": {"quality": "experimental", "status": "unofficial", "name": "telans", "description": {"en": "Overlay from telans - gaming/misc"}, "homepage": "https://github.com/telans/EBUILDS", "owner": [{"type": "person", "email": "telans@posteo.de", "name": "telans"}], "source": [{"type": "git", "uri": "https://github.com/telans/EBUILDS.git"}], "feed": ["https://github.com/telans/EBUILDS/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 18:17:53 +1300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "tf201": {"quality": "experimental", "status": "unofficial", "name": "tf201", "description": {"en": "TF201 (Asus Transformer Prime) overlay for Gentoo"}, "homepage": "https://github.com/Tux1c/tf201-overlay", "owner": [{"type": "person", "email": "tux1cc@gmail.com", "name": "Yan A."}], "source": [{"type": "git", "uri": "https://github.com/Tux1c/tf201-overlay"}], "x-state": "GOOD", "x-timestamp": "2015-04-11 16:03:12 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "tgbugs-overlay": {"quality": "experimental", "status": "unofficial", "name": "tgbugs-overlay", "description": {"en": "tgbugs portage overlay for custom ebuilds"}, "homepage": "https://github.com/tgbugs/tgbugs-overlay", "owner": [{"type": "person", "email": "tgbugs@gmail.com", "name": "Tom Gillespie"}], "source": [{"type": "git", "uri": "https://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git://github.com/tgbugs/tgbugs-overlay.git"}, {"type": "git", "uri": "git@github.com:tgbugs/tgbugs-overlay.git"}], "feed": ["https://github.com/tgbugs/tgbugs-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-26 00:12:30 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 357}, "thabairne": {"quality": "experimental", "status": "unofficial", "name": "thabairne", "description": {"en": "ntnn's Overlay"}, "homepage": "https://github.com/ntnn/gentoo-thabairne", "owner": [{"type": "person", "email": "nelo@wallus.de", "name": "Nelo-Thara Wallus"}], "source": [{"type": "git", "uri": "https://github.com/ntnn/gentoo-thabairne.git"}], "feed": ["https://github.com/ntnn/gentoo-thabairne/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-10-22 20:38:59 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 15}, "thegreatmcpain": {"quality": "experimental", "status": "unofficial", "name": "thegreatmcpain", "description": {"en": "TheGreatMcPain's personal ebuild overlay"}, "homepage": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay", "owner": [{"type": "person", "email": "sixsupersonic@gmail.com", "name": "James McClain"}], "source": [{"type": "git", "uri": "https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay.git"}, {"type": "git", "uri": "git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git"}], "feed": ["https://gitlab.com/TheGreatMcPain/thegreatmcpain-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-30 02:01:32 -0500\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "bobwya"], "x-ebuild-count": 138}, "tmacedo": {"quality": "experimental", "status": "unofficial", "name": "tmacedo", "description": {"en": "User Overlay"}, "homepage": "https://github.com/tmacedo/portage", "owner": [{"type": "person", "email": "tftfmacedo@gmail.com", "name": "Tiago Macedo"}], "source": [{"type": "git", "uri": "git://github.com/tmacedo/portage.git"}], "feed": ["https://github.com/tmacedo/portage/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-02 17:26:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 25}, "tocaro": {"quality": "experimental", "status": "unofficial", "name": "tocaro", "description": {"en": "tocaro personnal o.g.o"}, "homepage": "https://cgit.gentoo.org/user/tocaro.git/", "owner": [{"type": "person", "email": "tocaro@thocar.org", "name": "Thomas Carri\u00e9"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/tocaro.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/tocaro.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/tocaro.git"}], "feed": ["https://cgit.gentoo.org/user/tocaro.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-03-28 19:02:11 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "toniz4-overlay": {"quality": "experimental", "status": "unofficial", "name": "toniz4-overlay", "description": {"en": "Useful packages for your person use"}, "homepage": "https://github.com/toniz4/toniz4-overlay.git/", "owner": [{"type": "person", "email": "cassioavila@yandex.com", "name": "C\u00e1ssio Ribeiro Alves de \u00c1vila"}], "source": [{"type": "git", "uri": "https://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git://github.com/toniz4/toniz4-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com:toniz4/toniz4-overlay.git"}], "feed": ["https://github.com/toniz4/toniz4-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-16 23:28:35 -0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 8}, "toolchain": {"quality": "experimental", "status": "official", "name": "toolchain", "description": {"en": "Toolchain ebuilds that are unsuitable for the tree. Snapshots,\n unstable versions, etc..."}, "homepage": "https://cgit.gentoo.org/proj/toolchain.git/", "owner": [{"type": "project", "email": "toolchain@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/toolchain.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/toolchain.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/toolchain.git"}], "feed": ["https://cgit.gentoo.org/proj/toolchain.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-02-22 09:39:04 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 0}, "torbrowser": {"quality": "experimental", "status": "unofficial", "name": "torbrowser", "description": {"en": "Tor Browser related ebuilds"}, "homepage": "https://github.com/MeisterP/torbrowser-overlay", "owner": [{"type": "person", "email": "poncho@spahan.ch", "name": "MeisterP"}], "source": [{"type": "git", "uri": "https://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git://github.com/MeisterP/torbrowser-overlay.git"}, {"type": "git", "uri": "git@github.com:MeisterP/torbrowser-overlay.git"}], "feed": ["https://github.com/MeisterP/torbrowser-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 09:11:06 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "trolltoo": {"quality": "experimental", "status": "unofficial", "name": "trolltoo", "description": {"en": "An ebuild overlay for Gentoo."}, "homepage": "https://github.com/dallenwilson/trolltoo", "owner": [{"type": "person", "email": "dallen.wilson@gmail.com", "name": "Dallen Wilson"}], "source": [{"type": "git", "uri": "https://github.com/dallenwilson/trolltoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/dallenwilson/trolltoo.git"}], "feed": ["https://github.com/dallenwilson/trolltoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-21 11:30:17 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 22}, "tryton": {"quality": "experimental", "status": "unofficial", "name": "tryton", "description": {"en": "Tryton"}, "homepage": "http://www.tryton.org/", "owner": [{"type": "person", "email": "cedk@gentoo.org"}], "source": [{"type": "mercurial", "uri": "https://hg.tryton.org/tryton-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-29 13:47:56 +0200", "x-masters": ["gentoo"], "x-ebuild-count": 492}, "twister": {"quality": "experimental", "status": "unofficial", "name": "twister", "description": {"en": "Unoffical gentoo overlay for twister"}, "homepage": "https://github.com/ddorian1/gentoo-twister-overlay", "owner": [{"type": "person", "email": "mail@jschwab.org", "name": "Johannes Schwab"}], "source": [{"type": "git", "uri": "https://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git://github.com/ddorian1/gentoo-twister-overlay.git"}, {"type": "git", "uri": "git@github.com:ddorian1/gentoo-twister-overlay.git"}], "feed": ["https://github.com/ddorian1/gentoo-twister-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2018-01-06 12:40:31 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "ulm": {"quality": "experimental", "status": "official", "name": "ulm", "description": {"en": "Developer overlay"}, "homepage": "https://cgit.gentoo.org/repo/dev/ulm.git/", "owner": [{"type": "person", "email": "ulm@gentoo.org", "name": "Ulrich M\u00fcller"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/dev/ulm.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/dev/ulm.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/repo/dev/ulm.git"}], "feed": ["https://cgit.gentoo.org/repo/dev/ulm.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-21 22:16:56 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 10}, "ultrabug": {"quality": "experimental", "status": "official", "name": "ultrabug", "description": {"en": "Developer Overlay"}, "homepage": "https://cgit.gentoo.org/dev/ultrabug.git/", "owner": [{"type": "person", "email": "ultrabug@gentoo.org", "name": "Alexys Jacob"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/dev/ultrabug.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/dev/ultrabug.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/dev/ultrabug.git"}], "feed": ["https://cgit.gentoo.org/dev/ultrabug.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-18 14:18:36 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "unc3nsored": {"quality": "experimental", "status": "unofficial", "name": "unc3nsored", "description": {"en": "Overlay for software I didn't find in the main tree"}, "homepage": "https://github.com/xxc3nsoredxx/unc3nsored", "owner": [{"type": "person", "email": "xxc3ncoredxx@gmail.com", "name": "Oskari Pirhonen"}], "source": [{"type": "git", "uri": "https://github.com/xxc3nsoredxx/unc3nsored.git"}], "feed": ["https://github.com/xxc3nsoredxx/unc3nsored/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 21:39:14 -0600\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 3}, "unity-gentoo": {"quality": "experimental", "status": "unofficial", "name": "unity-gentoo", "description": {"en": "Overlay to install the Unity desktop"}, "homepage": "https://github.com/shiznix/unity-gentoo", "owner": [{"type": "person", "email": "rickfharris@yahoo.com.au", "name": "Rick Harris"}], "source": [{"type": "git", "uri": "https://github.com/shiznix/unity-gentoo"}, {"type": "git", "uri": "git://github.com/shiznix/unity-gentoo.git"}], "feed": ["https://github.com/feeds/shiznix/commits/unity-gentoo/master"], "x-state": "GOOD", "x-timestamp": "2021-03-28 20:02:41 +1030\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 186}, "usenet-overlay": {"quality": "experimental", "status": "unofficial", "name": "usenet-overlay", "description": {"en": "Personal Overlay for Lidarr, Radarr and Sonarr "}, "homepage": "https://github.com/xartin/gentoo-overlay", "owner": [{"type": "person", "email": "mcrawford@eliteitminds.com", "name": "Michael Crawford"}], "source": [{"type": "git", "uri": "https://github.com/xartin/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xartin/gentoo-overlay.git"}], "feed": ["https://github.com/xartin/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-27 20:24:41 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 17}, "vampire": {"quality": "experimental", "status": "unofficial", "name": "vampire", "description": {"en": "A personal repository. So much bleeding edge, you would bet a vampire was involved."}, "homepage": "https://github.com/TheCrueltySage/vampire-overlay", "owner": [{"type": "person", "email": "miltenfiremage@gmail.com", "name": "TheCrueltySage"}], "source": [{"type": "git", "uri": "https://github.com/TheCrueltySage/vampire-overlay.git"}, {"type": "git", "uri": "git://github.com/TheCrueltySage/vampire-overlay.git"}], "feed": ["https://github.com/TheCrueltySage/vampire-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2021-03-26 20:47:22 +0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 21}, "vapoursynth": {"quality": "experimental", "status": "unofficial", "name": "vapoursynth", "description": {"en": "Unofficial repository with all vapoursynth related ebuilds"}, "homepage": "https://github.com/4re/vapoursynth-portage", "owner": [{"type": "person", "email": "surukko@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/4re/vapoursynth-portage.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-27 22:11:56 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 302}, "vayerx": {"quality": "experimental", "status": "unofficial", "name": "vayerx", "description": {"en": "Personal overlay of Vasiliy Yeremeyev"}, "homepage": "https://github.com/vayerx/vayerx-gentoo/", "owner": [{"type": "person", "email": "vayerx@gmail.com", "name": "Vasiliy Yeremeyev"}], "source": [{"type": "git", "uri": "https://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git://github.com/vayerx/vayerx-gentoo.git"}, {"type": "git", "uri": "git@github.com:vayerx/vayerx-gentoo.git"}], "feed": ["https://github.com/vayerx/vayerx-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-23 04:57:18 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 67}, "vdr-devel": {"quality": "experimental", "status": "official", "name": "vdr-devel", "description": {"en": "Overlay for VDR, that contains ebuilds for development version\n of VDR, and specific plugins for that version."}, "homepage": "https://cgit.gentoo.org/proj/vdr/devel.git/", "owner": [{"type": "project", "email": "vdr@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/vdr/devel.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/vdr/devel.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/vdr/devel.git"}], "feed": ["https://cgit.gentoo.org/proj/vdr/devel.git/atom/"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-27 20:54:04 +0200\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "vifino-overlay": {"quality": "experimental", "status": "unofficial", "name": "vifino-overlay", "description": {"en": "vifino's personal overlay"}, "homepage": "https://github.com/vifino/vifino-overlay", "owner": [{"type": "person", "email": "vifino@tty.sh", "name": "Adrian \"vifino\" Pistol"}], "source": [{"type": "git", "uri": "https://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git://github.com/vifino/vifino-overlay.git"}, {"type": "git", "uri": "git@github.com:vifino/vifino-overlay.git"}], "feed": ["https://github.com/vifino/vifino-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-16 14:33:28 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 46}, "vklimovs": {"quality": "experimental", "status": "unofficial", "name": "vklimovs", "description": {"en": "vklimovs' personal portage overlay"}, "homepage": "https://github.com/vklimovs/portage-overlay", "owner": [{"type": "person", "email": "vklimovs@gmail.com", "name": "Vjaceslavs Klimovs"}], "source": [{"type": "git", "uri": "https://github.com/vklimovs/portage-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/vklimovs/portage-overlay.git"}], "feed": ["https://github.com/vklimovs/portage-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-14 10:14:16 -0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 24}, "vmacs": {"quality": "experimental", "status": "unofficial", "name": "vmacs", "description": {"en": "VMACS Personal Gentoo Overlay"}, "homepage": "https://cgit.gentoo.org/user/vmacs.git/", "owner": [{"type": "person", "email": "vance.m.allen@gmail.com", "name": "Vance M. Allen"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/vmacs.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/vmacs.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/vmacs.git"}], "feed": ["https://cgit.gentoo.org/user/vmacs.git/atom/"], "x-state": "GOOD", "x-timestamp": "2020-10-30 20:09:52 -0600\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 7}, "vortex": {"quality": "experimental", "status": "unofficial", "name": "vortex", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/nE0sIghT/vortex-overlay", "owner": [{"type": "person", "email": "ykonotopov@gnome.org", "name": "Yuri 'nE0sIghT' Konotopov"}], "source": [{"type": "git", "uri": "https://github.com/nE0sIghT/vortex-overlay.git"}, {"type": "git", "uri": "git://github.com/nE0sIghT/vortex-overlay.git"}], "feed": ["https://github.com/nE0sIghT/vortex-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-28 16:43:33 +0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 77}, "vowstar": {"quality": "experimental", "status": "unofficial", "name": "vowstar", "description": {"en": "Ebuilds from vowstar's git"}, "homepage": "https://github.com/vowstar/vowstar-overlay", "owner": [{"type": "person", "email": "vowstar@gmail.com"}], "source": [{"type": "git", "uri": "https://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git://github.com/vowstar/vowstar-overlay.git"}, {"type": "git", "uri": "git@github.com:vowstar/vowstar-overlay.git"}], "feed": ["https://github.com/vowstar/vowstar-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-10 11:48:58 +0800\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 74}, "voyageur": {"quality": "experimental", "status": "official", "name": "voyageur", "description": {"en": "Voyageur's random ebuilds stuff"}, "homepage": "https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/", "owner": [{"type": "person", "email": "voyageur@gentoo.org"}], "source": [{"type": "git", "uri": "https://cafarelli.fr/git/voyageur-overlay/"}], "feed": ["https://cafarelli.fr/cgi-bin/cgit.cgi/voyageur-overlay/atom"], "x-state": "GOOD", "x-timestamp": "2021-03-12 11:22:50 +0100\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 36}, "waebbl": {"quality": "experimental", "status": "unofficial", "name": "waebbl", "description": {"en": "waebbl's overlay"}, "homepage": "https://github.com/waebbl/waebbl-gentoo", "owner": [{"type": "person", "email": "waebbl@gmail.com", "name": "Bernd Waibel"}], "source": [{"type": "git", "uri": "https://github.com/waebbl/waebbl-gentoo.git"}, {"type": "git", "uri": "git+ssh://git@github.com/waebbl/waebbl-gentoo.git"}], "feed": ["https://github.com/waebbl/waebbl-gentoo/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-14 15:08:05 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "waffle-builds": {"quality": "experimental", "status": "unofficial", "name": "waffle-builds", "description": {"en": "FlyingWaffle's personal ebuild overlay."}, "homepage": "https://github.com/FlyingWaffleDev/waffle-builds", "owner": [{"type": "person", "email": "flyingwaffle@pm.me", "name": "FlyingWaffle"}], "source": [{"type": "git", "uri": "https://github.com/FlyingWaffleDev/waffle-builds.git"}, {"type": "git", "uri": "git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git"}], "feed": ["https://github.com/FlyingWaffleDev/waffle-builds/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 10:47:29 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 65}, "wayland-desktop": {"quality": "experimental", "status": "unofficial", "name": "wayland-desktop", "description": {"en": "gentoo overlay for wayland related ebuilds"}, "homepage": "https://github.com/bsd-ac/wayland-desktop", "owner": [{"type": "person", "email": "gentoo@aisha.cc", "name": "Aisha Tammy"}], "source": [{"type": "git", "uri": "https://github.com/bsd-ac/wayland-desktop.git"}, {"type": "git", "uri": "git+ssh://git@github.com/bsd-ac/wayland-desktop.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-31 02:22:20 -0400\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 108}, "wbrana": {"quality": "experimental", "status": "unofficial", "name": "wbrana", "description": {"en": "wbrana's overlay"}, "homepage": "https://cgit.gentoo.org/user/wbrana.git/", "owner": [{"type": "person", "email": "wbrana@gmail.com", "name": "William Brana"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wbrana.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wbrana.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wbrana.git"}], "feed": ["https://cgit.gentoo.org/user/wbrana.git/atom/"], "x-state": "GOOD", "x-timestamp": "2015-06-28 16:56:01 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "wdzierzan": {"quality": "experimental", "status": "unofficial", "name": "wdzierzan", "description": {"en": "Stuff I'd rather `emerge' than `stow'"}, "homepage": "https://cgit.gentoo.org/user/wdzierzan.git/", "owner": [{"type": "person", "email": "wojciech.dzierzanowski@gmail.com", "name": "Wojciech Dzier\u017canowski"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/wdzierzan.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/wdzierzan.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/wdzierzan.git"}], "feed": ["https://cgit.gentoo.org/user/wdzierzan.git/atom/"], "x-state": "GOOD", "x-timestamp": "2017-02-28 21:28:13 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "webos": {"quality": "experimental", "status": "unofficial", "name": "webos", "description": {"en": "Ported Open WebOS components and libraries"}, "homepage": "https://github.com/feniksa/webos-overlay", "owner": [{"type": "person", "email": "feniksa@rambler.ru", "name": "Maksym Sditanov"}], "source": [{"type": "git", "uri": "https://github.com/feniksa/webos-overlay.git"}, {"type": "git", "uri": "git://github.com:feniksa/webos-overlay.git"}, {"type": "git", "uri": "git@github.com:feniksa/webos-overlay.git"}], "feed": ["https://github.com/feniksa/webos-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-12-26 00:39:07 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 49}, "weuxel": {"quality": "experimental", "status": "unofficial", "name": "weuxel", "description": {"en": "Weuxels Personal Overlay"}, "homepage": "https://github.com/Weuxel/portage-weuxel", "owner": [{"type": "person", "email": "norman@smash-net.org", "name": "Norman Rie\u00df"}], "source": [{"type": "git", "uri": "https://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git://github.com/Weuxel/portage-weuxel.git"}, {"type": "git", "uri": "git@github.com:Weuxel/portage-weuxel.git"}], "feed": ["https://github.com/Weuxel/portage-weuxel/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-21 15:49:49 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 1}, "what4-java": {"quality": "experimental", "status": "unofficial", "name": "what4-java", "description": {"en": "Incubator for dev-java updates that the Gentoo Java team has no time for"}, "homepage": "https://github.com/kwhat/gentoo-what4-java-overlay", "owner": [{"type": "person", "email": "alex@1stleg.com", "name": "Alex Barker"}], "source": [{"type": "git", "uri": "https://github.com/kwhat/gentoo-what4-java-overlay.git"}], "x-state": "GOOD", "x-timestamp": "2020-07-02 08:48:49 -0700\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wichtounet": {"quality": "experimental", "status": "unofficial", "name": "wichtounet", "description": {"en": "Personal overlay of Baptiste Wicht"}, "homepage": "https://github.com/wichtounet/wichtounet-overlay", "owner": [{"type": "person", "email": "baptistewicht@gmail.com", "name": "Baptiste Wicht"}], "source": [{"type": "git", "uri": "https://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git://github.com/wichtounet/wichtounet-overlay.git"}, {"type": "git", "uri": "git@github.com:wichtounet/wichtounet-overlay.git"}], "feed": ["https://github.com/wichtounet/wichtounet-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-02-27 08:41:09 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 26}, "wine": {"quality": "testing", "status": "official", "name": "wine", "description": {"en": "All supported Wine ebuilds from the Gentoo Wine Project"}, "homepage": "https://wiki.gentoo.org/wiki/Project:Wine", "owner": [{"type": "project", "email": "wine@gentoo.org", "name": "Gentoo Wine Project"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/repo/proj/wine.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/repo/proj/wine.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-28 14:22:43 -0400\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 251}, "winny": {"quality": "experimental", "status": "unofficial", "name": "winny", "description": {"en": "Winny's personal overlay"}, "homepage": "https://github.com/winny-/winny-overlay", "owner": [{"type": "person", "email": "winston@ml1.net", "name": "winny"}], "source": [{"type": "git", "uri": "https://github.com/winny-/winny-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/winny-/winny-overlay.git"}], "feed": ["https://github.com/winny-/winny-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-29 21:48:48 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 66}, "wjn-overlay": {"quality": "experimental", "status": "unofficial", "name": "wjn-overlay", "description": {"en": "wjn's overlay for Gentoo Linux"}, "homepage": "https://bitbucket.org/wjn/wjn-overlay", "owner": [{"type": "person", "email": "wjn@aol.jp", "name": "wjn"}], "source": [{"type": "git", "uri": "https://bitbucket.org/wjn/wjn-overlay.git"}], "x-state": "BAD_CACHE", "x-timestamp": "2021-01-21 02:49:16 +0900\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "wuodan": {"quality": "experimental", "status": "unofficial", "name": "wuodan", "description": {"en": "An experimental portage overlay"}, "homepage": "https://github.com/Wuodan/gentoo-overlay", "owner": [{"type": "person", "email": "stefan.kuhn.zurich@gmail.com", "name": "Stefan Kuhn"}], "source": [{"type": "git", "uri": "https://github.com/Wuodan/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/Wuodan/gentoo-overlay.git"}], "feed": ["https://github.com/Wuodan/gentoo-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-09-01 16:33:01 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo", "pentoo"], "x-ebuild-count": 23}, "x11": {"quality": "experimental", "status": "official", "name": "x11", "description": {"en": "Gentoo X11 team ebuild repository"}, "homepage": "https://cgit.gentoo.org/proj/x11.git", "owner": [{"type": "project", "email": "x11@gentoo.org"}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/proj/x11.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/proj/x11"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/proj/x11.git"}], "feed": ["https://cgit.gentoo.org/proj/x11.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-02-15 21:31:57 -0500\n", "x-openpgp-signed": "U", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "xdch47": {"quality": "experimental", "status": "unofficial", "name": "xdch47", "description": {"en": "Gentoo portage overlay of xdch47"}, "homepage": "https://github.com/xdch47/gpo-xdch47", "owner": [{"type": "person", "email": "xdch47@posteo.de", "name": "Felix Neum\u00e4rker"}], "source": [{"type": "git", "uri": "https://github.com/xdch47/gpo-xdch47.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xdch47/gpo-xdch47.git"}], "x-state": "GOOD", "x-timestamp": "2021-03-04 07:24:58 +0100\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 41}, "xelnor": {"quality": "experimental", "status": "unofficial", "name": "xelnor", "description": {"en": "Rapha\u00ebl Barrois' (Xelnor) Gentoo overlay."}, "homepage": "http://overlay.xelnor.net", "owner": [{"type": "person", "email": "gentoo@xelnor.net"}], "source": [{"type": "git", "uri": "git://overlay.xelnor.net/overlay.git"}], "x-state": "GOOD", "x-timestamp": "2021-02-17 19:37:39 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 54}, "xoreos": {"quality": "experimental", "status": "unofficial", "name": "xoreos", "description": {"en": "Gentoo overlay for the xoreos project, providing a WIP reimplementation of the BioWare Aurora engine and related modding tools."}, "homepage": "https://github.com/xoreos/gentoo-overlay", "owner": [{"type": "person", "email": "drmccoy@drmccoy.de", "name": "Sven \"DrMcCoy\" Hesse"}], "source": [{"type": "git", "uri": "https://github.com/xoreos/gentoo-overlay.git"}, {"type": "git", "uri": "git+ssh://git@github.com/xoreos/gentoo-overlay.git"}], "feed": ["https://github.com/xoreos/gentoo-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-08-09 19:51:52 +0200\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 12}, "xwing": {"quality": "experimental", "status": "unofficial", "name": "xwing", "description": {"en": "This overlay contains some experimental stuff, such as\n turboprint printers driver (bug #61311), intel-536ep driver for lastest 2.6\n kernels (bug #127464), lastest grisbi version (proxy maintainer) before\n it's portage integration and so on."}, "homepage": "http://gentoo.xwing.info", "owner": [{"type": "person", "email": "casta@xwing.info"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.xwing.info/xwing-overlay"}], "x-state": "GOOD", "x-timestamp": "2021-03-14 10:51:44.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 23}, "yandex": {"quality": "experimental", "status": "unofficial", "name": "yandex", "description": {"en": "Gentoo overlay with packages for software made by Yandex", "ru": "\u041e\u0432\u0435\u0440\u043b\u0435\u0439 \u0441 \u0441\u043e\u0444\u0442\u043e\u043c, \u0432\u044b\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u043c \u042f\u043d\u0434\u0435\u043a\u0441\u043e\u043c"}, "homepage": "https://github.com/yandex-gentoo/overlay", "owner": [{"type": "person", "email": "mva@gentoo.org", "name": "Vadim A. Misbakh-Soloviov"}], "source": [{"type": "git", "uri": "https://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git://github.com/yandex-gentoo/overlay.git"}, {"type": "git", "uri": "git@github.com:yandex-gentoo/overlay.git"}], "feed": ["https://github.com/yandex-gentoo/overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2020-11-14 20:51:19 +0300\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 4}, "yoreek": {"quality": "experimental", "status": "unofficial", "name": "yoreek", "description": {"en": "Ebuilds related to nginx webserver modules"}, "homepage": "https://cgit.gentoo.org/user/yoreek.git/", "owner": [{"type": "person", "email": "yoreek@yahoo.com", "name": "Yuri U."}], "source": [{"type": "git", "uri": "https://anongit.gentoo.org/git/user/yoreek.git"}, {"type": "git", "uri": "git://anongit.gentoo.org/user/yoreek.git"}, {"type": "git", "uri": "git+ssh://git@git.gentoo.org/user/yoreek.git"}], "feed": ["https://cgit.gentoo.org/user/yoreek.git/atom/"], "x-state": "GOOD", "x-timestamp": "2021-01-11 17:13:27 +0200\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "youbroketheinternet": {"quality": "experimental", "status": "unofficial", "name": "youbroketheinternet", "description": {"en": "This overlay is a collaborative maintained Gentoo developer overlay. Some of us are involved with SecuShare, but we try out all sorts of XKEYSCORE-resistant technology. Some of our unique ebuilds are the full GNUnet suite, and software around the psyced chatserver. Some ebuilds are experimental/testing - refer to the included README for more info and details. If you would like to get involved read https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet"}, "homepage": "http://youbroketheinternet.org/#overlay", "owner": [{"type": "person", "email": "lynX@youbroketheinternet.pages.de", "name": "lynX"}], "source": [{"type": "git", "uri": "https://gnunet.org/git/youbroketheinternet-overlay.git"}, {"type": "git", "uri": "git://cheettyiapsyciew.onion/youbroketheinternet-overlay"}, {"type": "git", "uri": "git://gnunet.org/youbroketheinternet-overlay.git"}], "x-state": "GOOD", "x-timestamp": "1984-04-04 00:44:30 +0000\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 132}, "yurij-overlay": {"quality": "experimental", "status": "unofficial", "name": "yurij-overlay", "description": {"en": "Yurij's overlay"}, "homepage": "https://github.com/yurijmikhalevich/yurij-overlay", "owner": [{"type": "person", "email": "yurij@mikhalevi.ch", "name": "Yurij Mikhalevich"}], "source": [{"type": "git", "uri": "https://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git://github.com/yurijmikhalevich/yurij-overlay.git"}, {"type": "git", "uri": "git@github.com:yurijmikhalevich/yurij-overlay.git"}], "feed": ["https://github.com/yurijmikhalevich/yurij-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2017-09-03 21:21:55 +0300\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 2}, "yuzu-overlay": {"quality": "experimental", "status": "unofficial", "name": "yuzu-overlay", "description": {"en": "Provides the Yuzu Switch Emulator and required dependencies."}, "homepage": "https://github.com/Alex-Aralis/yuzu-overlay", "owner": [{"type": "person", "email": "alex.aralis@gmail.com", "name": "Alex Aralis"}], "source": [{"type": "git", "uri": "https://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git://github.com/Alex-Aralis/yuzu-overlay.git"}, {"type": "git", "uri": "git@github.com:Alex-Aralis/yuzu-overlay.git"}], "feed": ["https://github.com/Alex-Aralis/yuzu-overlay/commits/master.atom"], "x-state": "BAD_CACHE", "x-timestamp": "2020-08-25 11:16:37 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 5}, "zerodaysfordays": {"quality": "experimental", "status": "unofficial", "name": "zerodaysfordays", "description": {"en": "Jakob L. Kreuze's personal overlay."}, "homepage": "https://git.sr.ht/~jakob/zerodaysfordays", "owner": [{"type": "person", "email": "zerodaysfordays@sdf.lonestar.org", "name": "Jakob L. Kreuze"}], "source": [{"type": "git", "uri": "https://git.sr.ht/~jakob/zerodaysfordays"}], "x-state": "GOOD", "x-timestamp": "2020-05-09 19:15:21 -0400\n", "x-openpgp-signed": "E", "x-masters": ["gentoo"], "x-ebuild-count": 11}, "zscheile": {"quality": "experimental", "status": "unofficial", "name": "zscheile", "description": {"en": "Zscheile Overlay"}, "homepage": "https://github.com/zseri/portage-zscheile", "owner": [{"type": "person", "email": "zseri@ytrizja.de", "name": "Erik Zscheile"}], "source": [{"type": "git", "uri": "https://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git://github.com/zseri/portage-zscheile.git"}, {"type": "git", "uri": "git@github.com:zseri/portage-zscheile.git"}], "feed": ["https://github.com/zseri/portage-zscheile/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-03-24 18:19:42 +0100\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 83}, "zugaina": {"quality": "experimental", "status": "unofficial", "name": "zugaina", "description": {"en": "collection of ebuilds by ycarus"}, "homepage": "http://gpo.zugaina.org/Overlays/zugaina/", "owner": [{"type": "person", "email": "ycarus@zugaina.org"}], "source": [{"type": "rsync", "uri": "rsync://gentoo.zugaina.org/zugaina-portage"}], "x-state": "GOOD", "x-timestamp": "2019-07-24 19:12:13.000000000 +0000\n", "x-masters": ["gentoo"], "x-ebuild-count": 467}, "zx2c4": {"quality": "experimental", "status": "official", "name": "zx2c4", "description": {"en": "zx2c4's repository of additional ebuilds"}, "homepage": "http://git.zx2c4.com/portage/", "owner": [{"type": "person", "email": "zx2c4@gentoo.org", "name": "Jason A. Donenfeld"}], "source": [{"type": "git", "uri": "git://git.zx2c4.com/portage"}, {"type": "git", "uri": "http://git.zx2c4.com/portage"}, {"type": "git", "uri": "ssh://git@git.zx2c4.com/portage"}], "feed": ["http://git.zx2c4.com/portage/atom/?h=master"], "x-state": "GOOD", "x-timestamp": "2020-03-01 15:33:49 +0800\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 9}, "zyrenth": {"quality": "experimental", "status": "unofficial", "name": "zyrenth", "description": {"en": "Personal overlay"}, "homepage": "https://github.com/kabili207/zyrenth-overlay", "owner": [{"type": "person", "email": "kabi-bugz.gentoo@zyrenth.com", "name": "Amy Nagle"}], "source": [{"type": "git", "uri": "https://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git://github.com/kabili207/zyrenth-overlay.git"}, {"type": "git", "uri": "git@github.com:kabili207/zyrenth-overlay.git"}], "feed": ["https://github.com/kabili207/zyrenth-overlay/commits/master.atom"], "x-state": "GOOD", "x-timestamp": "2021-01-27 17:51:35 -0500\n", "x-openpgp-signed": "N", "x-masters": ["gentoo"], "x-ebuild-count": 33}} \ No newline at end of file
diff --git a/superposition.html b/superposition.html
index 395a82ab2325..14ae78da7ad1 100644
--- a/superposition.html
+++ b/superposition.html
@@ -40,91 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync superposition
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync superposition
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing superposition
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced superposition
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 superposition
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing superposition
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced superposition
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 superposition
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/superposition.txt b/superposition.txt
index 574c195eb6d8..2e16a2b3d5e7 100644
--- a/superposition.txt
+++ b/superposition.txt
@@ -13,43 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/user/superposition.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync superposition
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing superposition
-Cloning into '/var/lib/repo-mirror-ci/sync/superposition'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced superposition
* Sync succeeded
$ git log --format=%ci -1
diff --git a/swegener.html b/swegener.html
index f1c7fc473eaa..5ff162a8a4ca 100644
--- a/swegener.html
+++ b/swegener.html
@@ -38,153 +38,87 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync swegener
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync swegener
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing swegener
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Welcome To
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> ____ _____ _____ _ _ _____ ____ _
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> / ___|_ _| ____| / \ | | | ____| _ \ _ __ ___| |_
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> \___ \ | | | _| / _ \ | | | _| | |_) | | &#x27;_ \ / _ \ __|
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> ___) || | | |___ / ___ \| |___| |___| _ &lt; _| | | | __/ |_
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> |____/ |_| |_____/_/ \_\_____|_____|_| \_(_)_| |_|\___|\__|
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>IP: 144.76.13.132
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>AKA: rsync7.de.gentoo.org
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Location: Germany
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Contact: Sven Wegener &lt;swegener@gentoo.org&gt;
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Number of files: 167 (reg: 93, dir: 74)
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>Number of regular files transferred: 0
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Total file size: 107.78K bytes
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Total transferred file size: 0 bytes
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Literal data: 0 bytes
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>File list size: 4.99K
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Total bytes sent: 139
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Total bytes received: 5.08K
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>sent 139 bytes received 5.08K bytes 2.09K bytes/sec
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>total size is 107.78K speedup is 20.64
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing swegener
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced swegener
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Welcome To
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> ____ _____ _____ _ _ _____ ____ _
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> / ___|_ _| ____| / \ | | | ____| _ \ _ __ ___| |_
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 swegener
</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> \___ \ | | | _| / _ \ | | | _| | |_) | | &#x27;_ \ / _ \ __|
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> ___) || | | |___ / ___ \| |___| |___| _ &lt; _| | | | __/ |_
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> |____/ |_| |_____/_/ \_\_____|_____|_| \_(_)_| |_|\___|\__|
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>IP: 144.76.13.132
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>AKA: rsync7.de.gentoo.org
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>AKA: rsync.gentoo.stealer.net
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Connection: 1 GBit/s, rsync limited to 20 connections
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Location: Germany
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Contact: Sven Wegener &lt;swegener@gentoo.org&gt;
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>Number of files: 167 (reg: 93, dir: 74)
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Number of created files: 167 (reg: 93, dir: 74)
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>Number of regular files transferred: 93
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>Total file size: 107.78K bytes
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>Total transferred file size: 107.78K bytes
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>Literal data: 107.78K bytes
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>File list size: 4.99K
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>Total bytes sent: 2.18K
-</pre></td></tr>
- <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre>Total bytes received: 63.00K
-</pre></td></tr>
- <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>sent 2.18K bytes received 63.00K bytes 18.62K bytes/sec
-</pre></td></tr>
- <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>total size is 107.78K speedup is 1.65
-</pre></td></tr>
- <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre>*** synced swegener
-</pre></td></tr>
- <tr class="" id="l85"><td><a href="#l85"><span>85</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l86"><td><a href="#l86"><span>86</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l87"><td><a href="#l87"><span>87</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 swegener
-</pre></td></tr>
- <tr class="" id="l88"><td><a href="#l88"><span>88</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/swegener.txt b/swegener.txt
index 28b5dd9f7697..f4e6857e84d9 100644
--- a/swegener.txt
+++ b/swegener.txt
@@ -12,42 +12,9 @@
'source': [{'type': 'rsync',
'uri': 'rsync://rsync.gentoo.stealer.net/swegener-overlay/'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync swegener
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing swegener
Welcome To
____ _____ _____ _ _ _____ ____ _
@@ -66,21 +33,21 @@ Contact: Sven Wegener <swegener@gentoo.org>
Number of files: 167 (reg: 93, dir: 74)
-Number of created files: 167 (reg: 93, dir: 74)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 93
+Number of regular files transferred: 0
Total file size: 107.78K bytes
-Total transferred file size: 107.78K bytes
-Literal data: 107.78K bytes
+Total transferred file size: 0 bytes
+Literal data: 0 bytes
Matched data: 0 bytes
File list size: 4.99K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 2.18K
-Total bytes received: 63.00K
+Total bytes sent: 139
+Total bytes received: 5.08K
-sent 2.18K bytes received 63.00K bytes 18.62K bytes/sec
-total size is 107.78K speedup is 1.65
+sent 139 bytes received 5.08K bytes 2.09K bytes/sec
+total size is 107.78K speedup is 20.64
*** synced swegener
* Sync succeeded
$ stat --format=%y .
diff --git a/tabinol.html b/tabinol.html
index 99662c32681f..59ddb05759d0 100644
--- a/tabinol.html
+++ b/tabinol.html
@@ -36,99 +36,55 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync tabinol
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tabinol
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tabinol
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced tabinol
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tabinol
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing tabinol
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced tabinol
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tabinol
-</pre></td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-cpp/cpptoml-0.1.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-cpp/cpptoml-0.1.1: failed sourcing ebuild: EAPI=6 is not supported, (cmake-multilib.eclass, line 46: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/tabinol.txt b/tabinol.txt
index b3b7c6f21212..0b57816ca173 100644
--- a/tabinol.txt
+++ b/tabinol.txt
@@ -11,46 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Tabinol/tabinol-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tabinol
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tabinol
-Cloning into '/var/lib/repo-mirror-ci/sync/tabinol'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tabinol
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tamiko.html b/tamiko.html
index f8e1593e4a43..ccb1147ead61 100644
--- a/tamiko.html
+++ b/tamiko.html
@@ -40,91 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tamiko
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync tamiko
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing tamiko
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced tamiko
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tamiko
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing tamiko
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced tamiko
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tamiko
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tamiko.txt b/tamiko.txt
index f2af237b1c2e..0d5fb09c0308 100644
--- a/tamiko.txt
+++ b/tamiko.txt
@@ -13,43 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/dev/tamiko.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tamiko
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tamiko
-Cloning into '/var/lib/repo-mirror-ci/sync/tamiko'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tamiko
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tante.html b/tante.html
index a1fcf936e89c..0450e4f6f0ff 100644
--- a/tante.html
+++ b/tante.html
@@ -24,91 +24,53 @@
</pre></td></tr>
<tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync tante
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync tante
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing tante
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced tante
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tante
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing tante
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced tante
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tante
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tante.txt b/tante.txt
index c5013534b38f..4a7eb94280b2 100644
--- a/tante.txt
+++ b/tante.txt
@@ -5,43 +5,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/tante/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tante
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tante
-Cloning into '/var/lib/repo-mirror-ci/sync/tante'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tante
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tarantool.html b/tarantool.html
index 3073e922b12f..c2abae014c06 100644
--- a/tarantool.html
+++ b/tarantool.html
@@ -40,93 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tarantool
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync tarantool
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing tarantool
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced tarantool
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tarantool
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing tarantool
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced tarantool
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tarantool
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tarantool.txt b/tarantool.txt
index 5b8d43733f76..b106ddf29034 100644
--- a/tarantool.txt
+++ b/tarantool.txt
@@ -13,44 +13,24 @@
{'type': 'git',
'uri': 'git@github.com:tarantool/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tarantool
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tarantool
-Cloning into '/var/lib/repo-mirror-ci/sync/tarantool'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tarantool
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tastytea.html b/tastytea.html
index f46f0a8ebaba..8b2e8452d914 100644
--- a/tastytea.html
+++ b/tastytea.html
@@ -30,91 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync tastytea
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync tastytea
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing tastytea
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced tastytea
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tastytea
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing tastytea
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced tastytea
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tastytea
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tastytea.txt b/tastytea.txt
index 4f696cb5490e..5ce29e6f993e 100644
--- a/tastytea.txt
+++ b/tastytea.txt
@@ -8,43 +8,24 @@
'source': [{'type': 'git',
'uri': 'https://schlomp.space/tastytea/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tastytea
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tastytea
-Cloning into '/var/lib/repo-mirror-ci/sync/tastytea'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tastytea
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tatsh-overlay.html b/tatsh-overlay.html
index cfdbaf93a3d0..38e144546421 100644
--- a/tatsh-overlay.html
+++ b/tatsh-overlay.html
@@ -36,103 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync tatsh-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tatsh-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing tatsh-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:sogo-connector repo at &#x27;/var/lib/repo-mirror-ci/sync/sogo-connector&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:soltys repo at &#x27;/var/lib/repo-mirror-ci/sync/soltys&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:sorrow repo at &#x27;/var/lib/repo-mirror-ci/sync/sorrow&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:spikyatlinux repo at &#x27;/var/lib/repo-mirror-ci/sync/spikyatlinux&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:sping repo at &#x27;/var/lib/repo-mirror-ci/sync/sping&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:squeezebox repo at &#x27;/var/lib/repo-mirror-ci/sync/squeezebox&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:src_prepare-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/src_prepare-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sspreitz repo at &#x27;/var/lib/repo-mirror-ci/sync/sspreitz&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced tatsh-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:steam-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/steam-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:stha09 repo at &#x27;/var/lib/repo-mirror-ci/sync/stha09&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stowe-verlay repo at &#x27;/var/lib/repo-mirror-ci/sync/stowe-verlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:strohel repo at &#x27;/var/lib/repo-mirror-ci/sync/strohel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:stefantalpalaru repo at &#x27;/var/lib/repo-mirror-ci/sync/stefantalpalaru&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing tatsh-overlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced tatsh-overlay
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt
index 57db3510876b..09cdbe2fe14c 100644
--- a/tatsh-overlay.txt
+++ b/tatsh-overlay.txt
@@ -11,49 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Tatsh/tatsh-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tatsh-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sogo-connector repo at '/var/lib/repo-mirror-ci/sync/sogo-connector', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:soltys repo at '/var/lib/repo-mirror-ci/sync/soltys', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sorrow repo at '/var/lib/repo-mirror-ci/sync/sorrow', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:spikyatlinux repo at '/var/lib/repo-mirror-ci/sync/spikyatlinux', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sping repo at '/var/lib/repo-mirror-ci/sync/sping', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:squeezebox repo at '/var/lib/repo-mirror-ci/sync/squeezebox', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sspreitz repo at '/var/lib/repo-mirror-ci/sync/sspreitz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:steam-overlay repo at '/var/lib/repo-mirror-ci/sync/steam-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stha09 repo at '/var/lib/repo-mirror-ci/sync/stha09', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stowe-verlay repo at '/var/lib/repo-mirror-ci/sync/stowe-verlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:strohel repo at '/var/lib/repo-mirror-ci/sync/strohel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stefantalpalaru repo at '/var/lib/repo-mirror-ci/sync/stefantalpalaru', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tatsh-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tatsh-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/telans.html b/telans.html
index 8423583fc6ba..b2e223d0e9c4 100644
--- a/telans.html
+++ b/telans.html
@@ -26,93 +26,53 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync telans
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync telans
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing telans
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced telans
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 telans
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing telans
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced telans
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 telans
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/telans.txt b/telans.txt
index d044b180356a..c249ff7645fc 100644
--- a/telans.txt
+++ b/telans.txt
@@ -6,44 +6,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/telans/EBUILDS.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync telans
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing telans
-Cloning into '/var/lib/repo-mirror-ci/sync/telans'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced telans
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tf201.html b/tf201.html
index 5c9badc71d13..9b2e2d1888b0 100644
--- a/tf201.html
+++ b/tf201.html
@@ -24,95 +24,53 @@
</pre></td></tr>
<tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync tf201
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync tf201
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing tf201
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced tf201
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tf201
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing tf201
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced tf201
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tf201
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tf201.txt b/tf201.txt
index cc2db441331c..2b02c13d5e17 100644
--- a/tf201.txt
+++ b/tf201.txt
@@ -5,45 +5,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://github.com/Tux1c/tf201-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tf201
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tf201
-Cloning into '/var/lib/repo-mirror-ci/sync/tf201'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tf201
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tgbugs-overlay.html b/tgbugs-overlay.html
index c47ddd3b4d2c..9f5de359c72c 100644
--- a/tgbugs-overlay.html
+++ b/tgbugs-overlay.html
@@ -38,97 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tgbugs-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tgbugs-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing tgbugs-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced tgbugs-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tgbugs-overlay
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing tgbugs-overlay
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced tgbugs-overlay
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tgbugs-overlay
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tgbugs-overlay.txt b/tgbugs-overlay.txt
index 7a92eb06a275..1c132c23c748 100644
--- a/tgbugs-overlay.txt
+++ b/tgbugs-overlay.txt
@@ -12,46 +12,24 @@
'uri': 'git://github.com/tgbugs/tgbugs-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:tgbugs/tgbugs-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tgbugs-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tgbugs-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/tgbugs-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tgbugs-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/thabairne.html b/thabairne.html
index 4cd80e43220c..1e8f237970ad 100644
--- a/thabairne.html
+++ b/thabairne.html
@@ -32,97 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync thabairne
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync thabairne
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing thabairne
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced thabairne
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 thabairne
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing thabairne
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced thabairne
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 thabairne
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/thabairne.txt b/thabairne.txt
index 356548933fe7..a7aba88e166c 100644
--- a/thabairne.txt
+++ b/thabairne.txt
@@ -9,46 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/ntnn/gentoo-thabairne.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync thabairne
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing thabairne
-Cloning into '/var/lib/repo-mirror-ci/sync/thabairne'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced thabairne
* Sync succeeded
$ git log --format=%ci -1
diff --git a/thegreatmcpain.html b/thegreatmcpain.html
index 63d89a2669db..766316dfc028 100644
--- a/thegreatmcpain.html
+++ b/thegreatmcpain.html
@@ -36,97 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync thegreatmcpain
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync thegreatmcpain
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing thegreatmcpain
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced thegreatmcpain
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 thegreatmcpain
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing thegreatmcpain
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced thegreatmcpain
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 thegreatmcpain
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/thegreatmcpain.txt b/thegreatmcpain.txt
index 393ccb2da9a6..45f24c240764 100644
--- a/thegreatmcpain.txt
+++ b/thegreatmcpain.txt
@@ -11,46 +11,24 @@
{'type': 'git',
'uri': 'git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync thegreatmcpain
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing thegreatmcpain
-Cloning into '/var/lib/repo-mirror-ci/sync/thegreatmcpain'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced thegreatmcpain
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tmacedo.html b/tmacedo.html
index 1191f3013110..0c24efbace37 100644
--- a/tmacedo.html
+++ b/tmacedo.html
@@ -30,97 +30,53 @@
</pre></td></tr>
<tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync tmacedo
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync tmacedo
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing tmacedo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced tmacedo
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tmacedo
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing tmacedo
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced tmacedo
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tmacedo
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tmacedo.txt b/tmacedo.txt
index a46829367eee..5bd7066afe54 100644
--- a/tmacedo.txt
+++ b/tmacedo.txt
@@ -8,46 +8,24 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://github.com/tmacedo/portage.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tmacedo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tmacedo
-Cloning into '/var/lib/repo-mirror-ci/sync/tmacedo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tmacedo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tocaro.html b/tocaro.html
index f5fc01111463..9243723d1bce 100644
--- a/tocaro.html
+++ b/tocaro.html
@@ -38,97 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync tocaro
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync tocaro
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing tocaro
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced tocaro
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tocaro
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing tocaro
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced tocaro
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tocaro
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tocaro.txt b/tocaro.txt
index dad2276be798..764d0c767ea6 100644
--- a/tocaro.txt
+++ b/tocaro.txt
@@ -12,46 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/tocaro.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tocaro
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tocaro
-Cloning into '/var/lib/repo-mirror-ci/sync/tocaro'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced tocaro
* Sync succeeded
$ git log --format=%ci -1
diff --git a/toniz4-overlay.html b/toniz4-overlay.html
index c50d7e93169a..5aa0075645af 100644
--- a/toniz4-overlay.html
+++ b/toniz4-overlay.html
@@ -40,97 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toniz4-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync toniz4-overlay
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing toniz4-overlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced toniz4-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toniz4-overlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** syncing toniz4-overlay
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** synced toniz4-overlay
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toniz4-overlay
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/toniz4-overlay.txt b/toniz4-overlay.txt
index 2b4f82aa5cc6..1a603b936a12 100644
--- a/toniz4-overlay.txt
+++ b/toniz4-overlay.txt
@@ -13,46 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com:toniz4/toniz4-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync toniz4-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing toniz4-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/toniz4-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced toniz4-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/toolchain.html b/toolchain.html
index 1a2271b3cfc9..1957194a1e3f 100644
--- a/toolchain.html
+++ b/toolchain.html
@@ -40,103 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync toolchain
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync toolchain
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing toolchain
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced toolchain
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toolchain
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:tgbugs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:thabairne repo at &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:tmacedo repo at &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:toniz4-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** syncing toolchain
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;...
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** synced toolchain
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 toolchain
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/toolchain.txt b/toolchain.txt
index 43f22489cf1c..8f394bdd114f 100644
--- a/toolchain.txt
+++ b/toolchain.txt
@@ -13,49 +13,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/toolchain.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync toolchain
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tgbugs-overlay repo at '/var/lib/repo-mirror-ci/sync/tgbugs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thabairne repo at '/var/lib/repo-mirror-ci/sync/thabairne', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toniz4-overlay repo at '/var/lib/repo-mirror-ci/sync/toniz4-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing toolchain
-Cloning into '/var/lib/repo-mirror-ci/sync/toolchain'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced toolchain
* Sync succeeded
$ git log --format=%ci -1
diff --git a/torbrowser.html b/torbrowser.html
index 34b937a10974..4a9cf0cf9469 100644
--- a/torbrowser.html
+++ b/torbrowser.html
@@ -36,103 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync torbrowser
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync torbrowser
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing torbrowser
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced torbrowser
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 torbrowser
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tgbugs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:thabairne repo at &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tmacedo repo at &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:toniz4-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing torbrowser
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced torbrowser
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 torbrowser
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/torbrowser.txt b/torbrowser.txt
index 987b8c3c71c6..546990bc51bc 100644
--- a/torbrowser.txt
+++ b/torbrowser.txt
@@ -11,49 +11,24 @@
{'type': 'git',
'uri': 'git@github.com:MeisterP/torbrowser-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync torbrowser
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tgbugs-overlay repo at '/var/lib/repo-mirror-ci/sync/tgbugs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thabairne repo at '/var/lib/repo-mirror-ci/sync/thabairne', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toniz4-overlay repo at '/var/lib/repo-mirror-ci/sync/toniz4-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing torbrowser
-Cloning into '/var/lib/repo-mirror-ci/sync/torbrowser'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced torbrowser
* Sync succeeded
$ git log --format=%ci -1
diff --git a/trolltoo.html b/trolltoo.html
index 9918b81ea1ca..4175fe672560 100644
--- a/trolltoo.html
+++ b/trolltoo.html
@@ -36,103 +36,53 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync trolltoo
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync trolltoo
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing trolltoo
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced trolltoo
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 trolltoo
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:tgbugs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:thabairne repo at &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tmacedo repo at &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:toniz4-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing trolltoo
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/trolltoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced trolltoo
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 trolltoo
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/trolltoo.txt b/trolltoo.txt
index bfe6b2824fa3..b29fc9779041 100644
--- a/trolltoo.txt
+++ b/trolltoo.txt
@@ -11,49 +11,24 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/dallenwilson/trolltoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync trolltoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tgbugs-overlay repo at '/var/lib/repo-mirror-ci/sync/tgbugs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thabairne repo at '/var/lib/repo-mirror-ci/sync/thabairne', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toniz4-overlay repo at '/var/lib/repo-mirror-ci/sync/toniz4-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing trolltoo
-Cloning into '/var/lib/repo-mirror-ci/sync/trolltoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced trolltoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/tryton.html b/tryton.html
index 6dd1e7148794..90bc2ca720c2 100644
--- a/tryton.html
+++ b/tryton.html
@@ -26,121 +26,29 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync tryton
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync tryton
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing tryton
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>pulling from https://hg.tryton.org/tryton-overlay
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>searching for changes
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>no changes found
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** synced tryton
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ hg log -l 1 --template={date|isodatesec}
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tryton
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:stuff repo at &#x27;/var/lib/repo-mirror-ci/sync/stuff&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tabinol repo at &#x27;/var/lib/repo-mirror-ci/sync/tabinol&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tante repo at &#x27;/var/lib/repo-mirror-ci/sync/tante&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tarantool repo at &#x27;/var/lib/repo-mirror-ci/sync/tarantool&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tf201 repo at &#x27;/var/lib/repo-mirror-ci/sync/tf201&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tgbugs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:thabairne repo at &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:tmacedo repo at &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:toniz4-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing tryton
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>applying clone bundle from https://downloads-cdn.tryton.org/bundles/tryton-overlay-bzip2-v1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>adding changesets
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>adding manifests
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>adding file changes
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>added 2492 changesets with 19982 changes to 8271 files
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>finished applying clone bundle
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>searching for changes
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>no changes found
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>2492 local changesets published
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>updating to branch default
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>975 files updated, 0 files merged, 0 files removed, 0 files unresolved
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** synced tryton
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ hg log -l 1 --template={date|isodatesec}
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tryton
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/tryton.txt b/tryton.txt
index 4409109e2232..48385dfbeff2 100644
--- a/tryton.txt
+++ b/tryton.txt
@@ -6,59 +6,13 @@
'source': [{'type': 'mercurial',
'uri': 'https://hg.tryton.org/tryton-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync tryton
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:stuff repo at '/var/lib/repo-mirror-ci/sync/stuff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tabinol repo at '/var/lib/repo-mirror-ci/sync/tabinol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tante repo at '/var/lib/repo-mirror-ci/sync/tante', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tarantool repo at '/var/lib/repo-mirror-ci/sync/tarantool', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tf201 repo at '/var/lib/repo-mirror-ci/sync/tf201', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tgbugs-overlay repo at '/var/lib/repo-mirror-ci/sync/tgbugs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thabairne repo at '/var/lib/repo-mirror-ci/sync/thabairne', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toniz4-overlay repo at '/var/lib/repo-mirror-ci/sync/toniz4-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing tryton
-applying clone bundle from https://downloads-cdn.tryton.org/bundles/tryton-overlay-bzip2-v1
-adding changesets
-adding manifests
-adding file changes
-added 2492 changesets with 19982 changes to 8271 files
-finished applying clone bundle
+pulling from https://hg.tryton.org/tryton-overlay
searching for changes
no changes found
-2492 local changesets published
-updating to branch default
-975 files updated, 0 files merged, 0 files removed, 0 files unresolved
*** synced tryton
* Sync succeeded
$ hg log -l 1 --template={date|isodatesec}
diff --git a/twister.html b/twister.html
index 712f26c105f5..279d330377ae 100644
--- a/twister.html
+++ b/twister.html
@@ -40,91 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync twister
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync twister
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing twister
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:sabayon repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:sabayon-distro repo at &#x27;/var/lib/repo-mirror-ci/sync/sabayon-distro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:superposition repo at &#x27;/var/lib/repo-mirror-ci/sync/superposition&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:tamiko repo at &#x27;/var/lib/repo-mirror-ci/sync/tamiko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:tatsh-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tatsh-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:telans repo at &#x27;/var/lib/repo-mirror-ci/sync/telans&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tgbugs-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/tgbugs-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:thabairne repo at &#x27;/var/lib/repo-mirror-ci/sync/thabairne&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced twister
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:tmacedo repo at &#x27;/var/lib/repo-mirror-ci/sync/tmacedo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:toniz4-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/toniz4-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 twister
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:swegener repo at &#x27;/var/lib/repo-mirror-ci/sync/swegener&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing twister
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced twister
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 twister
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/twister.txt b/twister.txt
index f587faf2518d..aefe3f4c5ec8 100644
--- a/twister.txt
+++ b/twister.txt
@@ -13,43 +13,24 @@
{'type': 'git',
'uri': 'git@github.com:ddorian1/gentoo-twister-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync twister
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon repo at '/var/lib/repo-mirror-ci/sync/sabayon', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:sabayon-distro repo at '/var/lib/repo-mirror-ci/sync/sabayon-distro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:superposition repo at '/var/lib/repo-mirror-ci/sync/superposition', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tamiko repo at '/var/lib/repo-mirror-ci/sync/tamiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tatsh-overlay repo at '/var/lib/repo-mirror-ci/sync/tatsh-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:telans repo at '/var/lib/repo-mirror-ci/sync/telans', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tgbugs-overlay repo at '/var/lib/repo-mirror-ci/sync/tgbugs-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thabairne repo at '/var/lib/repo-mirror-ci/sync/thabairne', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toniz4-overlay repo at '/var/lib/repo-mirror-ci/sync/toniz4-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:swegener repo at '/var/lib/repo-mirror-ci/sync/swegener', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing twister
-Cloning into '/var/lib/repo-mirror-ci/sync/twister'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced twister
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ulm.html b/ulm.html
index 89805d97d351..2b5f8a1b2d69 100644
--- a/ulm.html
+++ b/ulm.html
@@ -38,67 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ulm
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ulm
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing ulm
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ulm
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ulm
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing ulm
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;...
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced ulm
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ulm
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/ulm.txt b/ulm.txt
index 7a45b89776c7..a0495a5966e1 100644
--- a/ulm.txt
+++ b/ulm.txt
@@ -12,31 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/dev/ulm.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync ulm
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ulm
-Cloning into '/var/lib/repo-mirror-ci/sync/ulm'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ulm
* Sync succeeded
$ git log --format=%ci -1
diff --git a/ultrabug.html b/ultrabug.html
index 8918c096faa9..72bf05d9806c 100644
--- a/ultrabug.html
+++ b/ultrabug.html
@@ -38,111 +38,97 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync ultrabug
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync ultrabug
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing ultrabug
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:swegener repo at &#x27;/var/lib/repo-mirror-ci/sync/swegener&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced ultrabug
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ultrabug
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** syncing ultrabug
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;...
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** synced ultrabug
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ultrabug
-</pre></td></tr>
- <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * app-admin/scylla-jmx-3.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * app-admin/scylla-jmx-3.1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-admin/scylla-jmx-3.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * app-admin/scylla-jmx-3.2.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-admin/scylla-jmx-3.2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * app-admin/scylla-jmx-3.2.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-admin/scylla-jmx-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * app-admin/scylla-jmx-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-admin/scylla-tools-3.0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * app-admin/scylla-tools-3.0.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * app-admin/scylla-tools-3.0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * app-admin/scylla-tools-3.0.8: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * app-admin/scylla-tools-3.0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * app-admin/scylla-tools-3.0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * app-admin/scylla-tools-3.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * app-admin/scylla-tools-3.0.10: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * app-admin/scylla-tools-3.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * app-admin/scylla-tools-3.1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * app-admin/scylla-tools-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-admin/scylla-tools-3.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * app-admin/scylla-tools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-admin/scylla-tools-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * app-admin/uwsgitop-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * app-admin/uwsgitop-0.9: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * dev-libs/libgraphqlparser-0.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * dev-libs/libgraphqlparser-0.7.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * dev-libs/thrift-0.9.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * dev-libs/thrift-0.9.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * dev-libs/thrift-0.11.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-libs/thrift-0.11.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> * dev-libs/thrift-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-libs/thrift-0.12.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/ultrabug.txt b/ultrabug.txt
index 0aeb57298fb8..ed424dd38297 100644
--- a/ultrabug.txt
+++ b/ultrabug.txt
@@ -12,31 +12,24 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/dev/ultrabug.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync ultrabug
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:swegener repo at '/var/lib/repo-mirror-ci/sync/swegener', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ultrabug
-Cloning into '/var/lib/repo-mirror-ci/sync/ultrabug'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced ultrabug
* Sync succeeded
$ git log --format=%ci -1
diff --git a/unc3nsored.html b/unc3nsored.html
index 73b13ab20e53..a0c11d5f8565 100644
--- a/unc3nsored.html
+++ b/unc3nsored.html
@@ -32,69 +32,53 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync unc3nsored
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync unc3nsored
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing unc3nsored
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:swegener repo at &#x27;/var/lib/repo-mirror-ci/sync/swegener&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced unc3nsored
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unc3nsored
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>*** syncing unc3nsored
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;...
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>*** synced unc3nsored
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unc3nsored
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/unc3nsored.txt b/unc3nsored.txt
index 4100aec874c5..622158b39849 100644
--- a/unc3nsored.txt
+++ b/unc3nsored.txt
@@ -9,32 +9,24 @@
'source': [{'type': 'git',
'uri': 'https://github.com/xxc3nsoredxx/unc3nsored.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync unc3nsored
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:swegener repo at '/var/lib/repo-mirror-ci/sync/swegener', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing unc3nsored
-Cloning into '/var/lib/repo-mirror-ci/sync/unc3nsored'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced unc3nsored
* Sync succeeded
$ git log --format=%ci -1
diff --git a/unity-gentoo.html b/unity-gentoo.html
index dea8898f16d4..48e28398ee17 100644
--- a/unity-gentoo.html
+++ b/unity-gentoo.html
@@ -34,65 +34,53 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync unity-gentoo
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync unity-gentoo
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:SwordArMor repo at &#x27;/var/lib/repo-mirror-ci/sync/SwordArMor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing unity-gentoo
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced unity-gentoo
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** syncing unity-gentoo
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unity-gentoo
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;...
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced unity-gentoo
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 unity-gentoo
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/unity-gentoo.txt b/unity-gentoo.txt
index 4aba93e0509e..d1aa5a4827aa 100644
--- a/unity-gentoo.txt
+++ b/unity-gentoo.txt
@@ -10,30 +10,24 @@
{'type': 'git',
'uri': 'git://github.com/shiznix/unity-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync unity-gentoo
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing unity-gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/unity-gentoo'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced unity-gentoo
* Sync succeeded
$ git log --format=%ci -1
diff --git a/usenet-overlay.html b/usenet-overlay.html
index b15b0946c20e..20be6d84efa2 100644
--- a/usenet-overlay.html
+++ b/usenet-overlay.html
@@ -36,71 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync usenet-overlay
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync usenet-overlay
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing usenet-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tastytea repo at &#x27;/var/lib/repo-mirror-ci/sync/tastytea&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tocaro repo at &#x27;/var/lib/repo-mirror-ci/sync/tocaro&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:torbrowser repo at &#x27;/var/lib/repo-mirror-ci/sync/torbrowser&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced usenet-overlay
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 usenet-overlay
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing usenet-overlay
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced usenet-overlay
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 usenet-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/usenet-overlay.txt b/usenet-overlay.txt
index 7a9e4be6fb72..674ba1cd0f3f 100644
--- a/usenet-overlay.txt
+++ b/usenet-overlay.txt
@@ -11,33 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/xartin/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync usenet-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tastytea repo at '/var/lib/repo-mirror-ci/sync/tastytea', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tocaro repo at '/var/lib/repo-mirror-ci/sync/tocaro', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:torbrowser repo at '/var/lib/repo-mirror-ci/sync/torbrowser', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing usenet-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/usenet-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced usenet-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vampire.html b/vampire.html
index 1b31c21f5983..589a30d75999 100644
--- a/vampire.html
+++ b/vampire.html
@@ -38,73 +38,53 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vampire
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vampire
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing vampire
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vampire
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vampire
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing vampire
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;...
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced vampire
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vampire
-</pre></td></tr>
- <tr class="err" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * media-sound/mopidy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * media-sound/mopidy-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/vampire.txt b/vampire.txt
index e4004df06a8d..181fcf5130e8 100644
--- a/vampire.txt
+++ b/vampire.txt
@@ -12,33 +12,23 @@
{'type': 'git',
'uri': 'git://github.com/TheCrueltySage/vampire-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vampire
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vampire
-Cloning into '/var/lib/repo-mirror-ci/sync/vampire'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vampire
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vapoursynth.html b/vapoursynth.html
index 4152709fb053..fb1ebb9f6920 100644
--- a/vapoursynth.html
+++ b/vapoursynth.html
@@ -28,71 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync vapoursynth
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync vapoursynth
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing vapoursynth
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced vapoursynth
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vapoursynth
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>*** syncing vapoursynth
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;...
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>*** synced vapoursynth
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vapoursynth
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vapoursynth.txt b/vapoursynth.txt
index 4c3c196df8b0..3a2aeda5fc69 100644
--- a/vapoursynth.txt
+++ b/vapoursynth.txt
@@ -7,33 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/4re/vapoursynth-portage.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vapoursynth
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vapoursynth
-Cloning into '/var/lib/repo-mirror-ci/sync/vapoursynth'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vapoursynth
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vayerx.html b/vayerx.html
index 2739f8c7c536..fb1ab3738ff7 100644
--- a/vayerx.html
+++ b/vayerx.html
@@ -36,71 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vayerx
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vayerx
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vayerx
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vayerx
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vayerx
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing vayerx
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;...
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>*** synced vayerx
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vayerx
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vayerx.txt b/vayerx.txt
index bc0726f51d5d..70eccf056cce 100644
--- a/vayerx.txt
+++ b/vayerx.txt
@@ -11,33 +11,23 @@
{'type': 'git', 'uri': 'git://github.com/vayerx/vayerx-gentoo.git'},
{'type': 'git', 'uri': 'git@github.com:vayerx/vayerx-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vayerx
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vayerx
-Cloning into '/var/lib/repo-mirror-ci/sync/vayerx'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vayerx
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vdr-devel.html b/vdr-devel.html
index 7f96ebc990bb..874d144e5b75 100644
--- a/vdr-devel.html
+++ b/vdr-devel.html
@@ -40,79 +40,53 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vdr-devel
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync vdr-devel
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing vdr-devel
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:thegreatmcpain repo at &#x27;/var/lib/repo-mirror-ci/sync/thegreatmcpain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:twister repo at &#x27;/var/lib/repo-mirror-ci/sync/twister&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced vdr-devel
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing vdr-devel
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced vdr-devel
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vdr-devel
-</pre></td></tr>
- <tr class="err" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * media-plugins/vdr-skindesigner-0.0.7: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
+ <tr class="err" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * media-plugins/vdr-skindesigner-0.0.7: failed sourcing ebuild: EAPI 5 is not supported by font.eclass., (font.eclass, line 12: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/vdr-devel.txt b/vdr-devel.txt
index 996c89e4450c..c5f67aaf311e 100644
--- a/vdr-devel.txt
+++ b/vdr-devel.txt
@@ -13,36 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/vdr/devel.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync vdr-devel
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:thegreatmcpain repo at '/var/lib/repo-mirror-ci/sync/thegreatmcpain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:twister repo at '/var/lib/repo-mirror-ci/sync/twister', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vdr-devel
-Cloning into '/var/lib/repo-mirror-ci/sync/vdr-devel'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vdr-devel
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vifino-overlay.html b/vifino-overlay.html
index 98e5f82a7f4d..35e6b17b441f 100644
--- a/vifino-overlay.html
+++ b/vifino-overlay.html
@@ -38,77 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vifino-overlay
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vifino-overlay
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing vifino-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vifino-overlay
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** syncing vifino-overlay
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** synced vifino-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vifino-overlay
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vifino-overlay.txt b/vifino-overlay.txt
index d3d305d2c0bb..2cee16d7e016 100644
--- a/vifino-overlay.txt
+++ b/vifino-overlay.txt
@@ -12,36 +12,23 @@
'uri': 'git://github.com/vifino/vifino-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:vifino/vifino-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vifino-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vifino-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/vifino-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vifino-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vklimovs.html b/vklimovs.html
index 314d545e6ad8..ef21db965d18 100644
--- a/vklimovs.html
+++ b/vklimovs.html
@@ -36,77 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vklimovs
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vklimovs
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vklimovs
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vklimovs
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing vklimovs
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced vklimovs
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vklimovs
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vklimovs.txt b/vklimovs.txt
index c4ea976d1f77..425a8def05f4 100644
--- a/vklimovs.txt
+++ b/vklimovs.txt
@@ -11,36 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/vklimovs/portage-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vklimovs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vklimovs
-Cloning into '/var/lib/repo-mirror-ci/sync/vklimovs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vklimovs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vmacs.html b/vmacs.html
index 1c0acdeab32c..7107a3fd4f7e 100644
--- a/vmacs.html
+++ b/vmacs.html
@@ -38,79 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vmacs
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync vmacs
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing vmacs
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced vmacs
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vmacs
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing vmacs
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced vmacs
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vmacs
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vmacs.txt b/vmacs.txt
index 826ba52affd6..dd3ce6e4ae15 100644
--- a/vmacs.txt
+++ b/vmacs.txt
@@ -12,37 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/vmacs.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vmacs
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vmacs
-Cloning into '/var/lib/repo-mirror-ci/sync/vmacs'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vmacs
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vortex.html b/vortex.html
index 798bccd19163..e053e3857c06 100644
--- a/vortex.html
+++ b/vortex.html
@@ -36,81 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vortex
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vortex
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vortex
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vortex
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vortex
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** syncing vortex
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;...
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** synced vortex
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vortex
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vortex.txt b/vortex.txt
index 4504b23eaf55..5c20802063c9 100644
--- a/vortex.txt
+++ b/vortex.txt
@@ -11,38 +11,23 @@
{'type': 'git',
'uri': 'git://github.com/nE0sIghT/vortex-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vortex
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vortex
-Cloning into '/var/lib/repo-mirror-ci/sync/vortex'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vortex
* Sync succeeded
$ git log --format=%ci -1
diff --git a/vowstar.html b/vowstar.html
index 4bb8b3e482b4..2978035eb707 100644
--- a/vowstar.html
+++ b/vowstar.html
@@ -36,73 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync vowstar
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync vowstar
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing vowstar
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced vowstar
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vowstar
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>*** syncing vowstar
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;...
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced vowstar
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 vowstar
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/vowstar.txt b/vowstar.txt
index a11d03a0d81a..8c3ad2fe3268 100644
--- a/vowstar.txt
+++ b/vowstar.txt
@@ -11,34 +11,23 @@
{'type': 'git',
'uri': 'git@github.com:vowstar/vowstar-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync vowstar
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing vowstar
-Cloning into '/var/lib/repo-mirror-ci/sync/vowstar'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced vowstar
* Sync succeeded
$ git log --format=%ci -1
diff --git a/voyageur.html b/voyageur.html
index 43ab6db8edd0..0dcd826c1f88 100644
--- a/voyageur.html
+++ b/voyageur.html
@@ -28,91 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync voyageur
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync voyageur
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing voyageur
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced voyageur
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 voyageur
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing voyageur
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced voyageur
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 voyageur
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/voyageur.txt b/voyageur.txt
index 8508226b9206..5af21bee2778 100644
--- a/voyageur.txt
+++ b/voyageur.txt
@@ -7,43 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://cafarelli.fr/git/voyageur-overlay/'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync voyageur
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing voyageur
-Cloning into '/var/lib/repo-mirror-ci/sync/voyageur'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced voyageur
* Sync succeeded
$ git log --format=%ci -1
diff --git a/waebbl.html b/waebbl.html
index e848a1870a6b..f0fec6ad009d 100644
--- a/waebbl.html
+++ b/waebbl.html
@@ -36,97 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync waebbl
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync waebbl
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing waebbl
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced waebbl
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waebbl
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing waebbl
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;...
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>*** synced waebbl
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waebbl
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/waebbl.txt b/waebbl.txt
index 5b4388f592c1..10e282e91fc7 100644
--- a/waebbl.txt
+++ b/waebbl.txt
@@ -11,46 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/waebbl/waebbl-gentoo.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync waebbl
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing waebbl
-Cloning into '/var/lib/repo-mirror-ci/sync/waebbl'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced waebbl
* Sync succeeded
$ git log --format=%ci -1
diff --git a/waffle-builds.html b/waffle-builds.html
index d8b87cff86a5..0dfbfbb92e7a 100644
--- a/waffle-builds.html
+++ b/waffle-builds.html
@@ -36,95 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync waffle-builds
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync waffle-builds
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing waffle-builds
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unc3nsored repo at &#x27;/var/lib/repo-mirror-ci/sync/unc3nsored&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced waffle-builds
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing waffle-builds
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced waffle-builds
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/waffle-builds.txt b/waffle-builds.txt
index 77f6d06e53b7..1f4fa9a2afca 100644
--- a/waffle-builds.txt
+++ b/waffle-builds.txt
@@ -11,45 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync waffle-builds
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unc3nsored repo at '/var/lib/repo-mirror-ci/sync/unc3nsored', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing waffle-builds
-Cloning into '/var/lib/repo-mirror-ci/sync/waffle-builds'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced waffle-builds
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wayland-desktop.html b/wayland-desktop.html
index a603cbdc3299..77e02194f9d9 100644
--- a/wayland-desktop.html
+++ b/wayland-desktop.html
@@ -34,97 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync wayland-desktop
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wayland-desktop
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing wayland-desktop
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:usenet-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/usenet-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced wayland-desktop
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wayland-desktop
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:waffle-builds repo at &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing wayland-desktop
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced wayland-desktop
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wayland-desktop
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/wayland-desktop.txt b/wayland-desktop.txt
index 7d1fae9c5f21..4ad0eeb2a68e 100644
--- a/wayland-desktop.txt
+++ b/wayland-desktop.txt
@@ -10,46 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/bsd-ac/wayland-desktop.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wayland-desktop
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:usenet-overlay repo at '/var/lib/repo-mirror-ci/sync/usenet-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waffle-builds repo at '/var/lib/repo-mirror-ci/sync/waffle-builds', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wayland-desktop
-Cloning into '/var/lib/repo-mirror-ci/sync/wayland-desktop'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wayland-desktop
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wbrana.html b/wbrana.html
index ef7ce2fb7522..d658832382a7 100644
--- a/wbrana.html
+++ b/wbrana.html
@@ -38,97 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync wbrana
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wbrana
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing wbrana
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vampire repo at &#x27;/var/lib/repo-mirror-ci/sync/vampire&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced wbrana
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wbrana
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:waffle-builds repo at &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing wbrana
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced wbrana
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wbrana
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/wbrana.txt b/wbrana.txt
index a1cebdfebb30..9e77c6d1643b 100644
--- a/wbrana.txt
+++ b/wbrana.txt
@@ -12,46 +12,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/wbrana.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wbrana
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vampire repo at '/var/lib/repo-mirror-ci/sync/vampire', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waffle-builds repo at '/var/lib/repo-mirror-ci/sync/waffle-builds', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wbrana
-Cloning into '/var/lib/repo-mirror-ci/sync/wbrana'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wbrana
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wdzierzan.html b/wdzierzan.html
index 5e37b12b8644..96ca551631e4 100644
--- a/wdzierzan.html
+++ b/wdzierzan.html
@@ -40,101 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wdzierzan
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync wdzierzan
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing wdzierzan
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced wdzierzan
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wdzierzan
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:waffle-builds repo at &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>*** syncing wdzierzan
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;...
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>*** synced wdzierzan
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wdzierzan
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/wdzierzan.txt b/wdzierzan.txt
index db5a3bc0c9e3..8d9fc5629676 100644
--- a/wdzierzan.txt
+++ b/wdzierzan.txt
@@ -13,48 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/wdzierzan.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wdzierzan
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waffle-builds repo at '/var/lib/repo-mirror-ci/sync/waffle-builds', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wdzierzan
-Cloning into '/var/lib/repo-mirror-ci/sync/wdzierzan'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wdzierzan
* Sync succeeded
$ git log --format=%ci -1
diff --git a/webos.html b/webos.html
index f62853b71c87..54f868e4b13d 100644
--- a/webos.html
+++ b/webos.html
@@ -38,101 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync webos
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync webos
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing webos
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:toolchain repo at &#x27;/var/lib/repo-mirror-ci/sync/toolchain&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vapoursynth repo at &#x27;/var/lib/repo-mirror-ci/sync/vapoursynth&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vayerx repo at &#x27;/var/lib/repo-mirror-ci/sync/vayerx&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:vifino-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/vifino-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced webos
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:vklimovs repo at &#x27;/var/lib/repo-mirror-ci/sync/vklimovs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:vortex repo at &#x27;/var/lib/repo-mirror-ci/sync/vortex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:vowstar repo at &#x27;/var/lib/repo-mirror-ci/sync/vowstar&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 webos
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:waffle-builds repo at &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing webos
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/webos&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced webos
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 webos
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/webos.txt b/webos.txt
index be6177456e21..a25192a66e33 100644
--- a/webos.txt
+++ b/webos.txt
@@ -12,48 +12,23 @@
'uri': 'git://github.com:feniksa/webos-overlay.git'},
{'type': 'git', 'uri': 'git@github.com:feniksa/webos-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync webos
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:toolchain repo at '/var/lib/repo-mirror-ci/sync/toolchain', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vapoursynth repo at '/var/lib/repo-mirror-ci/sync/vapoursynth', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vayerx repo at '/var/lib/repo-mirror-ci/sync/vayerx', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vifino-overlay repo at '/var/lib/repo-mirror-ci/sync/vifino-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vklimovs repo at '/var/lib/repo-mirror-ci/sync/vklimovs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vortex repo at '/var/lib/repo-mirror-ci/sync/vortex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vowstar repo at '/var/lib/repo-mirror-ci/sync/vowstar', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waffle-builds repo at '/var/lib/repo-mirror-ci/sync/waffle-builds', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing webos
-Cloning into '/var/lib/repo-mirror-ci/sync/webos'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced webos
* Sync succeeded
$ git log --format=%ci -1
diff --git a/weuxel.html b/weuxel.html
index 4905b1008f9a..1545e8d0c8c4 100644
--- a/weuxel.html
+++ b/weuxel.html
@@ -38,97 +38,51 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync weuxel
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync weuxel
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing weuxel
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:waffle-builds repo at &#x27;/var/lib/repo-mirror-ci/sync/waffle-builds&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>*** synced weuxel
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:webos repo at &#x27;/var/lib/repo-mirror-ci/sync/webos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 weuxel
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing weuxel
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced weuxel
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 weuxel
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/weuxel.txt b/weuxel.txt
index 318c61d2c4e5..8e7fa133cc3b 100644
--- a/weuxel.txt
+++ b/weuxel.txt
@@ -12,46 +12,23 @@
'uri': 'git://github.com/Weuxel/portage-weuxel.git'},
{'type': 'git', 'uri': 'git@github.com:Weuxel/portage-weuxel.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync weuxel
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waffle-builds repo at '/var/lib/repo-mirror-ci/sync/waffle-builds', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:webos repo at '/var/lib/repo-mirror-ci/sync/webos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing weuxel
-Cloning into '/var/lib/repo-mirror-ci/sync/weuxel'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced weuxel
* Sync succeeded
$ git log --format=%ci -1
diff --git a/what4-java.html b/what4-java.html
index b120e059312e..a4fa1d7da147 100644
--- a/what4-java.html
+++ b/what4-java.html
@@ -32,97 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync what4-java
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync what4-java
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing what4-java
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced what4-java
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:webos repo at &#x27;/var/lib/repo-mirror-ci/sync/webos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 what4-java
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** syncing what4-java
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;...
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** synced what4-java
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 what4-java
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/what4-java.txt b/what4-java.txt
index 243005403ead..ad52c3c9fc81 100644
--- a/what4-java.txt
+++ b/what4-java.txt
@@ -9,46 +9,23 @@
'source': [{'type': 'git',
'uri': 'https://github.com/kwhat/gentoo-what4-java-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync what4-java
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:webos repo at '/var/lib/repo-mirror-ci/sync/webos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing what4-java
-Cloning into '/var/lib/repo-mirror-ci/sync/what4-java'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced what4-java
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wichtounet.html b/wichtounet.html
index bf0fcf18e066..a6846b47c1d1 100644
--- a/wichtounet.html
+++ b/wichtounet.html
@@ -40,95 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync wichtounet
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync wichtounet
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing wichtounet
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced wichtounet
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:webos repo at &#x27;/var/lib/repo-mirror-ci/sync/webos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wichtounet
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing wichtounet
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced wichtounet
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wichtounet
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/wichtounet.txt b/wichtounet.txt
index c23fd8febf99..f320981a0c87 100644
--- a/wichtounet.txt
+++ b/wichtounet.txt
@@ -13,45 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:wichtounet/wichtounet-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wichtounet
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:webos repo at '/var/lib/repo-mirror-ci/sync/webos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wichtounet
-Cloning into '/var/lib/repo-mirror-ci/sync/wichtounet'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wichtounet
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wine.html b/wine.html
index 9e19655ee546..c42e1a36a230 100644
--- a/wine.html
+++ b/wine.html
@@ -36,99 +36,51 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wine
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync wine
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing wine
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:science repo at &#x27;/var/lib/repo-mirror-ci/sync/science&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:waebbl repo at &#x27;/var/lib/repo-mirror-ci/sync/waebbl&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced wine
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:webos repo at &#x27;/var/lib/repo-mirror-ci/sync/webos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wine
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:wichtounet repo at &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** syncing wine
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;...
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** synced wine
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wine
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/wine.txt b/wine.txt
index bf13f0c9eeb2..c664ac203856 100644
--- a/wine.txt
+++ b/wine.txt
@@ -11,47 +11,23 @@
{'type': 'git',
'uri': 'git://anongit.gentoo.org/repo/proj/wine.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync wine
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:waebbl repo at '/var/lib/repo-mirror-ci/sync/waebbl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:webos repo at '/var/lib/repo-mirror-ci/sync/webos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wichtounet repo at '/var/lib/repo-mirror-ci/sync/wichtounet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wine
-Cloning into '/var/lib/repo-mirror-ci/sync/wine'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wine
* Sync succeeded
$ git log --format=%ci -1
diff --git a/winny.html b/winny.html
index 6695fca97de1..aa3abcdfb2c0 100644
--- a/winny.html
+++ b/winny.html
@@ -32,95 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync winny
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync winny
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing winny
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced winny
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 winny
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:wichtounet repo at &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing winny
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced winny
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 winny
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/winny.txt b/winny.txt
index 0745f68bbdf9..e2a1869eea95 100644
--- a/winny.txt
+++ b/winny.txt
@@ -9,45 +9,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/winny-/winny-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync winny
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wichtounet repo at '/var/lib/repo-mirror-ci/sync/wichtounet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing winny
-Cloning into '/var/lib/repo-mirror-ci/sync/winny'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced winny
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wjn-overlay.html b/wjn-overlay.html
index 9154047fa4b5..73cb14360486 100644
--- a/wjn-overlay.html
+++ b/wjn-overlay.html
@@ -26,101 +26,57 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync wjn-overlay
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync wjn-overlay
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing wjn-overlay
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** synced wjn-overlay
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wjn-overlay
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:wichtounet repo at &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing wjn-overlay
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced wjn-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wjn-overlay
-</pre></td></tr>
- <tr class="err" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * app-dicts/dictd-wn-3.0_p33: failed sourcing ebuild: freedict.eclass is banned in EAPI=6, (freedict.eclass, line 22: called die)
+ <tr class="err" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * app-dicts/dictd-wn-3.0_p33: failed sourcing ebuild: freedict.eclass is banned in EAPI=6, (freedict.eclass, line 22: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * app-text/markdown-gtksourceview-2.1.9999-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * app-text/markdown-gtksourceview-2.1.9999-r2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * www-plugins/browserpass-3.0.6-r1: failed sourcing ebuild: external commands disallowed during metadata regen: &#x27;go-module_vendor_uris&#x27;
+ <tr class="err" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> * www-plugins/browserpass-3.0.6-r1: failed sourcing ebuild: external commands disallowed during metadata regen: &#x27;go-module_vendor_uris&#x27;
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/wjn-overlay.txt b/wjn-overlay.txt
index 71dacae56af2..5330cc27774a 100644
--- a/wjn-overlay.txt
+++ b/wjn-overlay.txt
@@ -6,45 +6,23 @@
'source': [{'type': 'git',
'uri': 'https://bitbucket.org/wjn/wjn-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wjn-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wichtounet repo at '/var/lib/repo-mirror-ci/sync/wichtounet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wjn-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/wjn-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wjn-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/wuodan.html b/wuodan.html
index ef20e0feca26..942f6d11efc5 100644
--- a/wuodan.html
+++ b/wuodan.html
@@ -36,99 +36,55 @@
</pre></td></tr>
<tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync wuodan
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync wuodan
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>*** syncing wuodan
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced wuodan
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wuodan
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** syncing wuodan
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;...
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>*** synced wuodan
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 wuodan
-</pre></td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * dev-python/fedmsg-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * dev-python/fedmsg-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * dev-vcs/hg-fast-export-180610: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> * dev-vcs/hg-fast-export-180610: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/wuodan.txt b/wuodan.txt
index 206c04dde68a..3622461ca837 100644
--- a/wuodan.txt
+++ b/wuodan.txt
@@ -11,45 +11,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/Wuodan/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync wuodan
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing wuodan
-Cloning into '/var/lib/repo-mirror-ci/sync/wuodan'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced wuodan
* Sync succeeded
$ git log --format=%ci -1
diff --git a/x11.html b/x11.html
index 3aeef4d0f564..12f42cc286ab 100644
--- a/x11.html
+++ b/x11.html
@@ -34,93 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync x11
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync x11
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing x11
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced x11
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 x11
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing x11
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced x11
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 x11
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/x11.txt b/x11.txt
index 8ea6eb692c78..409c4f8faf41 100644
--- a/x11.txt
+++ b/x11.txt
@@ -10,44 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/proj/x11.git'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync x11
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing x11
-Cloning into '/var/lib/repo-mirror-ci/sync/x11'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced x11
* Sync succeeded
$ git log --format=%ci -1
diff --git a/xdch47.html b/xdch47.html
index b8080998684e..f3fbe7d7974b 100644
--- a/xdch47.html
+++ b/xdch47.html
@@ -32,95 +32,51 @@
</pre></td></tr>
<tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>$ pmaint sync xdch47
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync xdch47
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>*** syncing xdch47
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>*** synced xdch47
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xdch47
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing xdch47
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/xdch47&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced xdch47
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xdch47
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xdch47.txt b/xdch47.txt
index 44b6b103a514..6f6e011543cc 100644
--- a/xdch47.txt
+++ b/xdch47.txt
@@ -9,45 +9,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/xdch47/gpo-xdch47.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync xdch47
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing xdch47
-Cloning into '/var/lib/repo-mirror-ci/sync/xdch47'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced xdch47
* Sync succeeded
$ git log --format=%ci -1
diff --git a/xelnor.html b/xelnor.html
index a934bc227887..e0077152e6d0 100644
--- a/xelnor.html
+++ b/xelnor.html
@@ -24,103 +24,51 @@
</pre></td></tr>
<tr class="" id="l7"><td><a href="#l7"><span>7</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre>$ pmaint sync xelnor
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync xelnor
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>*** syncing xelnor
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced xelnor
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wichtounet repo at &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xelnor
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wuodan repo at &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:xdch47 repo at &#x27;/var/lib/repo-mirror-ci/sync/xdch47&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing xelnor
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced xelnor
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xelnor
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xelnor.txt b/xelnor.txt
index eed81c21b7c2..98695e038842 100644
--- a/xelnor.txt
+++ b/xelnor.txt
@@ -5,49 +5,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'git://overlay.xelnor.net/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync xelnor
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wichtounet repo at '/var/lib/repo-mirror-ci/sync/wichtounet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wuodan repo at '/var/lib/repo-mirror-ci/sync/wuodan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xdch47 repo at '/var/lib/repo-mirror-ci/sync/xdch47', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing xelnor
-Cloning into '/var/lib/repo-mirror-ci/sync/xelnor'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced xelnor
* Sync succeeded
$ git log --format=%ci -1
diff --git a/xoreos.html b/xoreos.html
index 963cb9d4ad76..74b56d035383 100644
--- a/xoreos.html
+++ b/xoreos.html
@@ -40,99 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync xoreos
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync xoreos
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing xoreos
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:wbrana repo at &#x27;/var/lib/repo-mirror-ci/sync/wbrana&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced xoreos
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:wichtounet repo at &#x27;/var/lib/repo-mirror-ci/sync/wichtounet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xoreos
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:wuodan repo at &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>*** syncing xoreos
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/xoreos&#x27;...
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>*** synced xoreos
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xoreos
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xoreos.txt b/xoreos.txt
index b9e7058bfa22..ae35e8c6709c 100644
--- a/xoreos.txt
+++ b/xoreos.txt
@@ -13,47 +13,23 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/xoreos/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync xoreos
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wbrana repo at '/var/lib/repo-mirror-ci/sync/wbrana', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wichtounet repo at '/var/lib/repo-mirror-ci/sync/wichtounet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wuodan repo at '/var/lib/repo-mirror-ci/sync/wuodan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing xoreos
-Cloning into '/var/lib/repo-mirror-ci/sync/xoreos'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced xoreos
* Sync succeeded
$ git log --format=%ci -1
diff --git a/xwing.html b/xwing.html
index cf3af7f4630d..987e39ad9efd 100644
--- a/xwing.html
+++ b/xwing.html
@@ -38,133 +38,105 @@
</pre></td></tr>
<tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ pmaint sync xwing
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync xwing
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing xwing
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Contact Name : webmaster@xwing.info
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>Number of files: 1 (reg: 1)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Number of regular files transferred: 1
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>Total file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:vmacs repo at &#x27;/var/lib/repo-mirror-ci/sync/vmacs&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Total transferred file size: 32 bytes
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Literal data: 32 bytes
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wdzierzan repo at &#x27;/var/lib/repo-mirror-ci/sync/wdzierzan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>File list size: 47
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Total bytes sent: 85
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>Total bytes received: 133
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>sent 85 bytes received 133 bytes 87.20 bytes/sec
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>total size is 32 speedup is 0.15
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Contact Name : webmaster@xwing.info
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Number of files: 176 (reg: 115, dir: 61)
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:wuodan repo at &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of regular files transferred: 24
</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Total file size: 136.27K bytes
</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:xdch47 repo at &#x27;/var/lib/repo-mirror-ci/sync/xdch47&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Total transferred file size: 29.11K bytes
</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Literal data: 29.11K bytes
</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:xoreos repo at &#x27;/var/lib/repo-mirror-ci/sync/xoreos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>*** syncing xwing
+ <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>File list size: 5.79K
</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>This is xwing.info / alderaan.xwing.info
+ <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>
+ <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Contact Name : webmaster@xwing.info
+ <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>Total bytes sent: 643
</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>
+ <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Total bytes received: 21.30K
</pre></td></tr>
<tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>Number of files: 176 (reg: 115, dir: 61)
+ <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>sent 643 bytes received 21.30K bytes 8.78K bytes/sec
</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>Number of created files: 176 (reg: 115, dir: 61)
+ <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>total size is 136.27K speedup is 6.21
</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Number of deleted files: 0
+ <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced xwing
</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>Number of regular files transferred: 115
+ <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>Total file size: 136.27K bytes
+ <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>Total transferred file size: 136.27K bytes
+ <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>Literal data: 136.27K bytes
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>File list size: 5.79K
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre>Total bytes sent: 2.54K
-</pre></td></tr>
- <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>Total bytes received: 78.46K
-</pre></td></tr>
- <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>sent 2.54K bytes received 78.46K bytes 23.14K bytes/sec
-</pre></td></tr>
- <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre>total size is 136.27K speedup is 1.68
-</pre></td></tr>
- <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre>*** synced xwing
-</pre></td></tr>
- <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 xwing
-</pre></td></tr>
- <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/xwing.txt b/xwing.txt
index 8defe2783d3b..d600471a05cd 100644
--- a/xwing.txt
+++ b/xwing.txt
@@ -12,65 +12,51 @@
'source': [{'type': 'rsync',
'uri': 'rsync://gentoo.xwing.info/xwing-overlay'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync xwing
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vmacs repo at '/var/lib/repo-mirror-ci/sync/vmacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wdzierzan repo at '/var/lib/repo-mirror-ci/sync/wdzierzan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wuodan repo at '/var/lib/repo-mirror-ci/sync/wuodan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xdch47 repo at '/var/lib/repo-mirror-ci/sync/xdch47', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xoreos repo at '/var/lib/repo-mirror-ci/sync/xoreos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing xwing
This is xwing.info / alderaan.xwing.info
Contact Name : webmaster@xwing.info
+Number of files: 1 (reg: 1)
+Number of created files: 0
+Number of deleted files: 0
+Number of regular files transferred: 1
+Total file size: 32 bytes
+Total transferred file size: 32 bytes
+Literal data: 32 bytes
+Matched data: 0 bytes
+File list size: 47
+File list generation time: 0.001 seconds
+File list transfer time: 0.000 seconds
+Total bytes sent: 85
+Total bytes received: 133
+
+sent 85 bytes received 133 bytes 87.20 bytes/sec
+total size is 32 speedup is 0.15
+This is xwing.info / alderaan.xwing.info
+
+Contact Name : webmaster@xwing.info
+
+
Number of files: 176 (reg: 115, dir: 61)
-Number of created files: 176 (reg: 115, dir: 61)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 115
+Number of regular files transferred: 24
Total file size: 136.27K bytes
-Total transferred file size: 136.27K bytes
-Literal data: 136.27K bytes
+Total transferred file size: 29.11K bytes
+Literal data: 29.11K bytes
Matched data: 0 bytes
File list size: 5.79K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 2.54K
-Total bytes received: 78.46K
+Total bytes sent: 643
+Total bytes received: 21.30K
-sent 2.54K bytes received 78.46K bytes 23.14K bytes/sec
-total size is 136.27K speedup is 1.68
+sent 643 bytes received 21.30K bytes 8.78K bytes/sec
+total size is 136.27K speedup is 6.21
*** synced xwing
* Sync succeeded
$ stat --format=%y .
diff --git a/yandex.html b/yandex.html
index bd042c40bfa0..4de91ea25af8 100644
--- a/yandex.html
+++ b/yandex.html
@@ -42,85 +42,51 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync yandex
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync yandex
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing yandex
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced yandex
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yandex
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** syncing yandex
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;...
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced yandex
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yandex
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/yandex.txt b/yandex.txt
index f3fb164f783b..bd794a3916c5 100644
--- a/yandex.txt
+++ b/yandex.txt
@@ -14,40 +14,23 @@
'uri': 'git://github.com/yandex-gentoo/overlay.git'},
{'type': 'git', 'uri': 'git@github.com:yandex-gentoo/overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync yandex
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing yandex
-Cloning into '/var/lib/repo-mirror-ci/sync/yandex'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced yandex
* Sync succeeded
$ git log --format=%ci -1
diff --git a/yoreek.html b/yoreek.html
index 234e5b731b71..235a15ac9e09 100644
--- a/yoreek.html
+++ b/yoreek.html
@@ -34,87 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync yoreek
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync yoreek
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing yoreek
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:weuxel repo at &#x27;/var/lib/repo-mirror-ci/sync/weuxel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced yoreek
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wuodan repo at &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yoreek
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>*** syncing yoreek
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;...
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** synced yoreek
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yoreek
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/yoreek.txt b/yoreek.txt
index ce4d970a7da5..a07994ac4a2a 100644
--- a/yoreek.txt
+++ b/yoreek.txt
@@ -10,41 +10,23 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/user/yoreek.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync yoreek
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:weuxel repo at '/var/lib/repo-mirror-ci/sync/weuxel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wuodan repo at '/var/lib/repo-mirror-ci/sync/wuodan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing yoreek
-Cloning into '/var/lib/repo-mirror-ci/sync/yoreek'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced yoreek
* Sync succeeded
$ git log --format=%ci -1
diff --git a/youbroketheinternet.html b/youbroketheinternet.html
index d4d44464776a..c3c2478330f2 100644
--- a/youbroketheinternet.html
+++ b/youbroketheinternet.html
@@ -56,93 +56,53 @@
</pre></td></tr>
<tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>$ pmaint sync youbroketheinternet
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>$ pmaint sync youbroketheinternet
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>*** syncing youbroketheinternet
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:ulm repo at &#x27;/var/lib/repo-mirror-ci/sync/ulm&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:ultrabug repo at &#x27;/var/lib/repo-mirror-ci/sync/ultrabug&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:unity-gentoo repo at &#x27;/var/lib/repo-mirror-ci/sync/unity-gentoo&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:vdr-devel repo at &#x27;/var/lib/repo-mirror-ci/sync/vdr-devel&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:wayland-desktop repo at &#x27;/var/lib/repo-mirror-ci/sync/wayland-desktop&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:what4-java repo at &#x27;/var/lib/repo-mirror-ci/sync/what4-java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:winny repo at &#x27;/var/lib/repo-mirror-ci/sync/winny&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** synced youbroketheinternet
</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wuodan repo at &#x27;/var/lib/repo-mirror-ci/sync/wuodan&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:xdch47 repo at &#x27;/var/lib/repo-mirror-ci/sync/xdch47&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 youbroketheinternet
</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>WARNING:pkgcore:yandex repo at &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>*** syncing youbroketheinternet
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;...
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>*** synced youbroketheinternet
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 youbroketheinternet
-</pre></td></tr>
- <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/youbroketheinternet.txt b/youbroketheinternet.txt
index 5442257f5e72..c326d7fdbe3c 100644
--- a/youbroketheinternet.txt
+++ b/youbroketheinternet.txt
@@ -21,44 +21,24 @@
{'type': 'git',
'uri': 'git://gnunet.org/youbroketheinternet-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync youbroketheinternet
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ulm repo at '/var/lib/repo-mirror-ci/sync/ulm', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ultrabug repo at '/var/lib/repo-mirror-ci/sync/ultrabug', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:unity-gentoo repo at '/var/lib/repo-mirror-ci/sync/unity-gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:vdr-devel repo at '/var/lib/repo-mirror-ci/sync/vdr-devel', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wayland-desktop repo at '/var/lib/repo-mirror-ci/sync/wayland-desktop', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:what4-java repo at '/var/lib/repo-mirror-ci/sync/what4-java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:winny repo at '/var/lib/repo-mirror-ci/sync/winny', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wuodan repo at '/var/lib/repo-mirror-ci/sync/wuodan', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xdch47 repo at '/var/lib/repo-mirror-ci/sync/xdch47', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yandex repo at '/var/lib/repo-mirror-ci/sync/yandex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing youbroketheinternet
-Cloning into '/var/lib/repo-mirror-ci/sync/youbroketheinternet'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
+Already up to date.
*** synced youbroketheinternet
* Sync succeeded
$ git log --format=%ci -1
diff --git a/yurij-overlay.html b/yurij-overlay.html
index 2ce3941dd8f0..b942c69804f4 100644
--- a/yurij-overlay.html
+++ b/yurij-overlay.html
@@ -40,79 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync yurij-overlay
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync yurij-overlay
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing yurij-overlay
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:xdch47 repo at &#x27;/var/lib/repo-mirror-ci/sync/xdch47&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced yurij-overlay
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yurij-overlay
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>*** syncing yurij-overlay
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/yurij-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** synced yurij-overlay
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yurij-overlay
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/yurij-overlay.txt b/yurij-overlay.txt
index 8c0482442976..65a97158bf15 100644
--- a/yurij-overlay.txt
+++ b/yurij-overlay.txt
@@ -13,37 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:yurijmikhalevich/yurij-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync yurij-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xdch47 repo at '/var/lib/repo-mirror-ci/sync/xdch47', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing yurij-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/yurij-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced yurij-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/yuzu-overlay.html b/yuzu-overlay.html
index b822908aed65..b18169285527 100644
--- a/yuzu-overlay.html
+++ b/yuzu-overlay.html
@@ -42,93 +42,61 @@
</pre></td></tr>
<tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync yuzu-overlay
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>$ pmaint sync yuzu-overlay
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>*** syncing yuzu-overlay
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:yandex repo at &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>*** synced yuzu-overlay
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yuzu-overlay
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing yuzu-overlay
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/yuzu-overlay&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced yuzu-overlay
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 yuzu-overlay
-</pre></td></tr>
- <tr class="err" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * games-emulation/yuzu-0.327: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * games-emulation/yuzu-0.327: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * games-emulation/yuzu-0.337: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> * games-emulation/yuzu-0.337: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> * games-emulation/yuzu-0.358: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> * games-emulation/yuzu-0.358: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> * games-emulation/yuzu-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> * games-emulation/yuzu-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="err" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> * games-emulation/yuzu-dev-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
+ <tr class="err" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> * games-emulation/yuzu-dev-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156: called die)
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> * Cache regen failed with 1
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Cache regen failed with 1
</pre></td></tr>
</table>
diff --git a/yuzu-overlay.txt b/yuzu-overlay.txt
index 667ac31a3e46..7402099731d8 100644
--- a/yuzu-overlay.txt
+++ b/yuzu-overlay.txt
@@ -14,39 +14,23 @@
{'type': 'git',
'uri': 'git@github.com:Alex-Aralis/yuzu-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync yuzu-overlay
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yandex repo at '/var/lib/repo-mirror-ci/sync/yandex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing yuzu-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/yuzu-overlay'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced yuzu-overlay
* Sync succeeded
$ git log --format=%ci -1
diff --git a/zerodaysfordays.html b/zerodaysfordays.html
index fac03e80e15a..2103525826f1 100644
--- a/zerodaysfordays.html
+++ b/zerodaysfordays.html
@@ -28,85 +28,51 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync zerodaysfordays
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>$ pmaint sync zerodaysfordays
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** syncing zerodaysfordays
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:yandex repo at &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** synced zerodaysfordays
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zerodaysfordays
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:yurij-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/yurij-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing zerodaysfordays
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/zerodaysfordays&#x27;...
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>*** synced zerodaysfordays
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zerodaysfordays
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/zerodaysfordays.txt b/zerodaysfordays.txt
index 1a466c73e695..bca15f4fad47 100644
--- a/zerodaysfordays.txt
+++ b/zerodaysfordays.txt
@@ -7,40 +7,23 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~jakob/zerodaysfordays'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync zerodaysfordays
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yandex repo at '/var/lib/repo-mirror-ci/sync/yandex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yurij-overlay repo at '/var/lib/repo-mirror-ci/sync/yurij-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing zerodaysfordays
-Cloning into '/var/lib/repo-mirror-ci/sync/zerodaysfordays'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced zerodaysfordays
* Sync succeeded
$ git log --format=%ci -1
diff --git a/zscheile.html b/zscheile.html
index 49f65a50747f..07664b16db22 100644
--- a/zscheile.html
+++ b/zscheile.html
@@ -40,85 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync zscheile
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync zscheile
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing zscheile
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:yandex repo at &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced zscheile
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zscheile
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:yurij-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/yurij-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing zscheile
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/zscheile&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced zscheile
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zscheile
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/zscheile.txt b/zscheile.txt
index 829c72a0277e..fddae8526ded 100644
--- a/zscheile.txt
+++ b/zscheile.txt
@@ -13,40 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:zseri/portage-zscheile.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync zscheile
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yandex repo at '/var/lib/repo-mirror-ci/sync/yandex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yurij-overlay repo at '/var/lib/repo-mirror-ci/sync/yurij-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing zscheile
-Cloning into '/var/lib/repo-mirror-ci/sync/zscheile'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced zscheile
* Sync succeeded
$ git log --format=%ci -1
diff --git a/zugaina.html b/zugaina.html
index df82969cf305..4dd64ae5027d 100644
--- a/zugaina.html
+++ b/zugaina.html
@@ -26,119 +26,57 @@
</pre></td></tr>
<tr class="" id="l8"><td><a href="#l8"><span>8</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync zugaina
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>$ pmaint sync zugaina
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing zugaina
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>Number of files: 1,813 (reg: 1,423, dir: 390)
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>Number of created files: 0
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>Number of deleted files: 0
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Number of regular files transferred: 0
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Total file size: 2.19M bytes
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>Total transferred file size: 0 bytes
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>Literal data: 0 bytes
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>Matched data: 0 bytes
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>File list size: 43.66K
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>File list generation time: 0.001 seconds
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>File list transfer time: 0.000 seconds
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Total bytes sent: 491
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>Total bytes received: 46.58K
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>sent 491 bytes received 46.58K bytes 18.83K bytes/sec
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>total size is 2.19M speedup is 46.51
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced zugaina
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ stat --format=%y .
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zugaina
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:yuzu-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/yuzu-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:zerodaysfordays repo at &#x27;/var/lib/repo-mirror-ci/sync/zerodaysfordays&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:zscheile repo at &#x27;/var/lib/repo-mirror-ci/sync/zscheile&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>*** syncing zugaina
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Number of files: 1,813 (reg: 1,423, dir: 390)
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Number of created files: 1,813 (reg: 1,423, dir: 390)
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>Number of deleted files: 0
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Number of regular files transferred: 1,423
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Total file size: 2.19M bytes
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>Total transferred file size: 2.19M bytes
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>Literal data: 2.19M bytes
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>Matched data: 0 bytes
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>File list size: 49.85K
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>File list generation time: 0.001 seconds
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>File list transfer time: 0.000 seconds
-</pre></td></tr>
- <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre>Total bytes sent: 29.04K
-</pre></td></tr>
- <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre>Total bytes received: 1.18M
-</pre></td></tr>
- <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre>
-</pre></td></tr>
- <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre>sent 29.04K bytes received 1.18M bytes 345.88K bytes/sec
-</pre></td></tr>
- <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>total size is 2.19M speedup is 1.81
-</pre></td></tr>
- <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre>*** synced zugaina
-</pre></td></tr>
- <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ stat --format=%y .
-</pre></td></tr>
- <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zugaina
-</pre></td></tr>
- <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/zugaina.txt b/zugaina.txt
index d31d76accbd5..932ed5bf1572 100644
--- a/zugaina.txt
+++ b/zugaina.txt
@@ -6,58 +6,27 @@
'source': [{'type': 'rsync',
'uri': 'rsync://gentoo.zugaina.org/zugaina-portage'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync zugaina
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yuzu-overlay repo at '/var/lib/repo-mirror-ci/sync/yuzu-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zerodaysfordays repo at '/var/lib/repo-mirror-ci/sync/zerodaysfordays', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zscheile repo at '/var/lib/repo-mirror-ci/sync/zscheile', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing zugaina
Number of files: 1,813 (reg: 1,423, dir: 390)
-Number of created files: 1,813 (reg: 1,423, dir: 390)
+Number of created files: 0
Number of deleted files: 0
-Number of regular files transferred: 1,423
+Number of regular files transferred: 0
Total file size: 2.19M bytes
-Total transferred file size: 2.19M bytes
-Literal data: 2.19M bytes
+Total transferred file size: 0 bytes
+Literal data: 0 bytes
Matched data: 0 bytes
-File list size: 49.85K
+File list size: 43.66K
File list generation time: 0.001 seconds
File list transfer time: 0.000 seconds
-Total bytes sent: 29.04K
-Total bytes received: 1.18M
+Total bytes sent: 491
+Total bytes received: 46.58K
-sent 29.04K bytes received 1.18M bytes 345.88K bytes/sec
-total size is 2.19M speedup is 1.81
+sent 491 bytes received 46.58K bytes 18.83K bytes/sec
+total size is 2.19M speedup is 46.51
*** synced zugaina
* Sync succeeded
$ stat --format=%y .
diff --git a/zx2c4.html b/zx2c4.html
index 66fd745f542e..3247c6fbc997 100644
--- a/zx2c4.html
+++ b/zx2c4.html
@@ -34,89 +34,51 @@
</pre></td></tr>
<tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> &#x27;status&#x27;: &#x27;official&#x27;}
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre>$ pmaint sync zx2c4
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync zx2c4
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing zx2c4
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:yandex repo at &#x27;/var/lib/repo-mirror-ci/sync/yandex&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>*** synced zx2c4
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zx2c4
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:yurij-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/yurij-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:zerodaysfordays repo at &#x27;/var/lib/repo-mirror-ci/sync/zerodaysfordays&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:zscheile repo at &#x27;/var/lib/repo-mirror-ci/sync/zscheile&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>*** syncing zx2c4
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/zx2c4&#x27;...
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>*** synced zx2c4
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zx2c4
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/zx2c4.txt b/zx2c4.txt
index a9b8d5ceb3de..0bf9864fbabd 100644
--- a/zx2c4.txt
+++ b/zx2c4.txt
@@ -10,42 +10,23 @@
{'type': 'git', 'uri': 'http://git.zx2c4.com/portage'},
{'type': 'git', 'uri': 'ssh://git@git.zx2c4.com/portage'}],
'status': 'official'}
- * Adding new repository
$ pmaint sync zx2c4
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yandex repo at '/var/lib/repo-mirror-ci/sync/yandex', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yurij-overlay repo at '/var/lib/repo-mirror-ci/sync/yurij-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zerodaysfordays repo at '/var/lib/repo-mirror-ci/sync/zerodaysfordays', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zscheile repo at '/var/lib/repo-mirror-ci/sync/zscheile', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing zx2c4
-Cloning into '/var/lib/repo-mirror-ci/sync/zx2c4'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced zx2c4
* Sync succeeded
$ git log --format=%ci -1
diff --git a/zyrenth.html b/zyrenth.html
index e21461c4f713..9a0edf4b7ffa 100644
--- a/zyrenth.html
+++ b/zyrenth.html
@@ -40,85 +40,51 @@
</pre></td></tr>
<tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> &#x27;status&#x27;: &#x27;unofficial&#x27;}
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * Adding new repository
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync zyrenth
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>$ pmaint sync zyrenth
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>*** syncing zyrenth
</pre></td></tr>
- <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is
</pre></td></tr>
- <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>commands sometime before your next pull:
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy)
</pre></td></tr>
- <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.rebase true # rebase
</pre></td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> git config pull.ff only # fast-forward only
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>You can replace &quot;git config&quot; with &quot;git config --global&quot; to set a default
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase,
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>or --ff-only on the command line to override the configured default per
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>invocation.
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>WARNING:pkgcore:HomeAssistantRepository repo at &#x27;/var/lib/repo-mirror-ci/sync/HomeAssistantRepository&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Already up to date.
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>WARNING:pkgcore:calculate repo at &#x27;/var/lib/repo-mirror-ci/sync/calculate&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>*** synced zyrenth
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>WARNING:pkgcore:kde repo at &#x27;/var/lib/repo-mirror-ci/sync/kde&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> * Sync succeeded
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>WARNING:pkgcore:nymphos repo at &#x27;/var/lib/repo-mirror-ci/sync/nymphos&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>WARNING:pkgcore:slonko repo at &#x27;/var/lib/repo-mirror-ci/sync/slonko&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>WARNING:pkgcore:ssnb repo at &#x27;/var/lib/repo-mirror-ci/sync/ssnb&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zyrenth
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:tryton repo at &#x27;/var/lib/repo-mirror-ci/sync/tryton&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>WARNING:pkgcore:voyageur repo at &#x27;/var/lib/repo-mirror-ci/sync/voyageur&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>WARNING:pkgcore:wine repo at &#x27;/var/lib/repo-mirror-ci/sync/wine&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>WARNING:pkgcore:wjn-overlay repo at &#x27;/var/lib/repo-mirror-ci/sync/wjn-overlay&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>WARNING:pkgcore:x11 repo at &#x27;/var/lib/repo-mirror-ci/sync/x11&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>WARNING:pkgcore:xelnor repo at &#x27;/var/lib/repo-mirror-ci/sync/xelnor&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>WARNING:pkgcore:yoreek repo at &#x27;/var/lib/repo-mirror-ci/sync/yoreek&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>WARNING:pkgcore:youbroketheinternet repo at &#x27;/var/lib/repo-mirror-ci/sync/youbroketheinternet&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>WARNING:pkgcore:zerodaysfordays repo at &#x27;/var/lib/repo-mirror-ci/sync/zerodaysfordays&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>WARNING:pkgcore:zscheile repo at &#x27;/var/lib/repo-mirror-ci/sync/zscheile&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
-</pre></td></tr>
- <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>*** syncing zyrenth
-</pre></td></tr>
- <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/zyrenth&#x27;...
-</pre></td></tr>
- <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>*** synced zyrenth
-</pre></td></tr>
- <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Sync succeeded
-</pre></td></tr>
- <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre>$ git log --format=%ci -1
-</pre></td></tr>
- <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
-</pre></td></tr>
- <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 zyrenth
-</pre></td></tr>
- <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>
diff --git a/zyrenth.txt b/zyrenth.txt
index fb1d36179869..be07bfef28a9 100644
--- a/zyrenth.txt
+++ b/zyrenth.txt
@@ -13,40 +13,23 @@
{'type': 'git',
'uri': 'git@github.com:kabili207/zyrenth-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync zyrenth
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:nymphos repo at '/var/lib/repo-mirror-ci/sync/nymphos', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:ssnb repo at '/var/lib/repo-mirror-ci/sync/ssnb', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:tryton repo at '/var/lib/repo-mirror-ci/sync/tryton', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:voyageur repo at '/var/lib/repo-mirror-ci/sync/voyageur', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wine repo at '/var/lib/repo-mirror-ci/sync/wine', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:wjn-overlay repo at '/var/lib/repo-mirror-ci/sync/wjn-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:x11 repo at '/var/lib/repo-mirror-ci/sync/x11', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:xelnor repo at '/var/lib/repo-mirror-ci/sync/xelnor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:yoreek repo at '/var/lib/repo-mirror-ci/sync/yoreek', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:youbroketheinternet repo at '/var/lib/repo-mirror-ci/sync/youbroketheinternet', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zerodaysfordays repo at '/var/lib/repo-mirror-ci/sync/zerodaysfordays', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:zscheile repo at '/var/lib/repo-mirror-ci/sync/zscheile', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing zyrenth
-Cloning into '/var/lib/repo-mirror-ci/sync/zyrenth'...
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** synced zyrenth
* Sync succeeded
$ git log --format=%ci -1